Merge from Chromium at DEPS revision 30.0.1599.23

This commit was generated by merge_to_master.py.

Change-Id: Icc43d5e2b37569e5a240d2c361b2232a61d3c878