Merge from Chromium at DEPS revision 30.0.1599.31

This commit was generated by merge_to_master.py.

Change-Id: I23ea04969becf5c3a08f399d9c665e48962b490e