Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: I267365d540397b5902a65873800f25f82658fdd9