Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: Iccb3593c87dac4a6cd2e2e7162a16ef0c410794d