Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I1ee1405458f60b20f9d8bb679bc13679abe7e5fe