Merge from Chromium at DEPS revision 30.0.1599.101

This commit was generated by merge_to_master.py.

Change-Id: I3349611c58937bf63f99e9d8c0c44ea74618fac5