Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Icbc209d9a98e12b4f82ebba531ed7a1e9320796a