Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I4d50f13a7152bd508c6c3771bfd1c945c9a6f92a