Merge from Chromium at DEPS revision 30.0.1599.31

This commit was generated by merge_to_master.py.

Change-Id: I5c10bfefadf8ddfb84bbea823633b6e0a411c2ae