Merge from Chromium at DEPS revision 30.0.1599.101

This commit was generated by merge_to_master.py.

Change-Id: Ifa0d4514786c87878185cac3e8245f844275ac6f