Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I1d4f5882bf11ea662fb0b348ba4ebccb18b6bc12