Merge from Chromium at DEPS revision 30.0.1599.39

This commit was generated by merge_to_master.py.

Change-Id: I2b887907447928b7249a5e19409d8672d4dd123e