Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I96ba6ffafffc4694a7e9ea1c7cd051237a5ad71d