Merge from Chromium at DEPS revision 30.0.1599.80

This commit was generated by merge_to_master.py.

Change-Id: I85686e2c9c2ba9db388d3554c0b323b5ed776857
3 files changed