Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I9415cd7635aaaad246910bf64b52803586457dcd