Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Id435f0d98e8a116c6859e261e0b59f46bf440b3c