Merge from Chromium at DEPS revision 30.0.1599.23

This commit was generated by merge_to_master.py.

Change-Id: I2b39eb7ef7166eae043d730971bb268d30f40418