Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: Ibbdacaa5ebd98eaa7b02ddc357305bf149ce8e90