Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: If0b6650c3897237a7810766aefee6db00f66e078