Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: Ie0621a691f0c92d8fc898e755fcf23935aef510d