am 2cb80146: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.58

* commit '2cb8014610f1052c023d561adf802bc9aa7cbdc8':
  Merge from Chromium at DEPS revision 30.0.1599.58