Merge from Chromium at DEPS revision 30.0.1599.101

This commit was generated by merge_to_master.py.

Change-Id: Idf34fc64e5c44d60ce3290818fda14d51f53f539
4 files changed