Merge from Chromium at DEPS revision 30.0.1599.23

This commit was generated by merge_to_master.py.

Change-Id: Ia095d76588ef4995750c6268dd8776c185f23d94