Merge from Chromium at DEPS revision 30.0.1599.48

This commit was generated by merge_to_master.py.

Change-Id: I1deb6f37e1f6ccc98933ab10a2224215559fdc84
2 files changed