Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I001656512958954beb9df55d1f8ff369126db0ca