Merge from Chromium at DEPS revision 30.0.1599.35

This commit was generated by merge_to_master.py.

Change-Id: Ie17d084a5c1c34971e8bf0e5a929b0a3428cd668
10 files changed