Merge from Chromium at DEPS revision 30.0.1599.85

This commit was generated by merge_to_master.py.

Change-Id: I788be16de86d204048b826ae91b3dcddce48db52