Merge from Chromium at DEPS revision 30.0.1599.40

This commit was generated by merge_to_master.py.

Change-Id: I51870a85ef0a32044be97c5579a7c807e93ea18b
18 files changed