Merge from Chromium at DEPS revision 30.0.1599.31

This commit was generated by merge_to_master.py.

Change-Id: I0ec0b7f10c4b32b7f50291ced769c27645ebd5a2