Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854

1 files changed, 30 insertions, 43 deletions

diff --git a/DEPS b/DEPS
index 1fb48f105f..1d05a62d4c 100644
--- a/DEPS
+++ b/DEPS
@@ -28,48 +28,48 @@ vars = {
   "libcxxabi_revision": "206024",
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
-  "webkit_revision": "178426",
+  "webkit_revision": "179692",
   "chromium_git": "https://chromium.googlesource.com",
   "chromiumos_git": "https://chromium.googlesource.com/chromiumos",
   "pdfium_git": "https://pdfium.googlesource.com",
   "skia_git": "https://skia.googlesource.com",
   "boringssl_git": "https://boringssl.googlesource.com",
   "swig_revision": "230490",
-  "nacl_revision": "13456",
+  "nacl_revision": "13580",
   # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
   # to update other nacl_*_revision's.
   "nacl_tools_revision": "13077",  # native_client/DEPS: tools_rev
   "google_toolbox_for_mac_revision": "662",
-  "libaddressinput_revision": "305",
+  "libaddressinput_revision": "316",
   "libphonenumber_revision": "621",
-  "libvpx_revision": "282874",
-  "lss_revision": "26",
+  "libvpx_revision": "287125",
+  "lss_revision": "31",
   "sfntly_revision": "239",
   "lighttpd_revision": "33737",
-  "skia_revision": "384b0202c040034ba1e8f2e3789a01e4b05a6a2b",
+  "skia_revision": "da7a944e293d27ec5c7be06b224921ae0058d35a",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.
   "v8_branch": "trunk",
-  "v8_revision": "22468",
+  "v8_revision": "22897",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling WebRTC
   # and V8 without interference from each other.
-  "webrtc_revision": "6680",
+  "webrtc_revision": "6825",
   "jsoncpp_revision": "248",
-  "nss_revision": "277057",
+  "nss_revision": "287121",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
-  "swarming_revision": "2cbc12487aea464730bcf60230f4d4d63d61ac51",
+  "swarming_revision": "bbf1fcca7932d92cca9d7dab46ea271a7f6d61fb",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling openssl
   # and whatever else without interference from each other.
-  "openssl_revision": "275836",
+  "openssl_revision": "284247",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  "angle_revision": "a1851e8fbb596b5cd8da1ba585ce69641f7f3337",
+  "angle_revision": "d9ba4f7318979e927c7a3320c5746c25381eae90",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling build tools
   # and whatever else without interference from each other.
@@ -77,20 +77,20 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFIum
   # and whatever else without interference from each other.
-  "pdfium_revision": "3fb18f41076a111e48cd8cdaee596075c89c275c",
+  "pdfium_revision": "465c2a84ba709d932040c9e80db508e93c138da6",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling openmax_dl
   # and whatever else without interference from each other.
-  "openmax_dl_revision": "6483",
+  "openmax_dl_revision": "6777",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling BoringSSL
   # and whatever else without interference from each other.
-  "boringssl_revision": "09020c2f08df11179b93e6548117806a4c0d0d45",
+  "boringssl_revision": "533cbee57eec77268ef9f53c4039ec753240fb37",
 }
 
 deps = {
   "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1345",
+    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1359",
 
   "src/buildtools":
     Var("chromium_git") + "/chromium/buildtools.git@" +
@@ -112,7 +112,7 @@ deps = {
     Var("chromium_git") + "/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8",
 
   "src/third_party/trace-viewer":
-    (Var("googlecode_url") % "trace-viewer") + "/trunk@1308",
+    (Var("googlecode_url") % "trace-viewer") + "/trunk@1449",
 
   "src/third_party/WebKit":
     Var("webkit_trunk") + "@" + Var("webkit_revision"),
@@ -126,13 +126,13 @@ deps = {
     "/external/w3c/csswg-test.git@bacbb4a8dca702cd86646761fde96793db13d4f1",
 
   "src/third_party/icu":
-    "/trunk/deps/third_party/icu46@262949",
+    "/trunk/deps/third_party/icu52@287122",
 
   "src/third_party/libexif/sources":
     "/trunk/deps/third_party/libexif/sources@265008",
 
   "src/third_party/hunspell":
-    "/trunk/deps/third_party/hunspell@283809",
+    "/trunk/deps/third_party/hunspell@287123",
 
   "src/third_party/hunspell_dictionaries":
     "/trunk/deps/third_party/hunspell_dictionaries@255132",
@@ -157,10 +157,10 @@ deps = {
     (Var("googlecode_url") % "snappy") + "/trunk@80",
 
   "src/tools/grit":
-    (Var("googlecode_url") % "grit-i18n") + "/trunk@170",
+    (Var("googlecode_url") % "grit-i18n") + "/trunk@172",
 
   "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1951",
+    (Var("googlecode_url") % "gyp") + "/trunk@1959",
 
   "src/tools/swarming_client":
     Var("chromium_git") + "/external/swarming.client.git@" +
@@ -210,9 +210,8 @@ deps = {
   "src/third_party/swig/Lib":
     "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
 
-  # Make sure you update the two functional.DEPS and webdriver.DEPS too.
   "src/third_party/webdriver/pylib":
-    (Var("googlecode_url") % "selenium") + "/trunk/py@18337",
+    (Var("googlecode_url") % "selenium") + "/trunk/py@18456",
 
   "src/third_party/libvpx":
     "/trunk/deps/third_party/libvpx@" +
@@ -220,7 +219,7 @@ deps = {
 
   "src/third_party/ffmpeg":
     Var("chromium_git") +
-    "/chromium/third_party/ffmpeg.git@4b7b36f956209fad838ad87d0129130713fbb00c",
+    "/chromium/third_party/ffmpeg.git@5ab896ad9dffd4a78e3c310de8e3507ded3e3239",
 
   "src/third_party/libjingle/source/talk":
     (Var("googlecode_url") % "webrtc") + "/trunk/talk@" +
@@ -243,7 +242,7 @@ deps = {
     "/trunk/deps/third_party/libjpeg_turbo@272637",
 
   "src/third_party/flac":
-    "/trunk/deps/third_party/flac@222897",
+    "/trunk/deps/third_party/flac@287124",
 
   "src/third_party/pyftpdlib/src":
     (Var("googlecode_url") % "pyftpdlib") + "/trunk@977",
@@ -309,7 +308,7 @@ deps = {
     "/trunk/deps/third_party/mesa@265279",
 
   "src/third_party/cld_2/src":
-    (Var("googlecode_url") % "cld2") + "/trunk@161",
+    (Var("googlecode_url") % "cld2") + "/trunk@165",
 
   "src/chrome/browser/resources/pdf/html_office":
      Var("chromium_git") +
@@ -317,7 +316,7 @@ deps = {
 
   "src/third_party/libwebm/source":
     Var("chromium_git") +
-      "/webm/libwebm.git@8be63972fdd7ae8c041778f8ba674ade903395c9",
+      "/webm/libwebm.git@0d4cb404ea4195e5e21d04db2c955615535ce62e",
 
   "src/third_party/openssl":
     "/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
@@ -414,8 +413,6 @@ deps_os = {
     "src/third_party/libexif/sources": None,
     "src/third_party/libjpeg_turbo": None,
     "src/third_party/libsrtp": None,
-    "src/third_party/libvpx": None,
-    "src/third_party/libyuv": None,
     "src/third_party/mesa/src": None,
     "src/third_party/opus/src": None,
     "src/third_party/openmax_dl": None,
@@ -431,7 +428,6 @@ deps_os = {
     "src/third_party/webdriver/pylib": None,
     "src/third_party/webgl": None,
     "src/third_party/webpagereplay": None,
-    "src/third_party/webrtc": None,
     "src/third_party/WebKit/LayoutTests/w3c/web-platform-tests": None,
     "src/third_party/WebKit/LayoutTests/w3c/csswg-test": None,
     "src/third_party/yasm/source/patched-yasm": None,
@@ -480,17 +476,17 @@ deps_os = {
     # For Linux and Chromium OS.
     "src/third_party/cros_system_api":
       Var("chromiumos_git") + "/platform/system_api.git" +
-      "@5e0746db937822e77288800bd8d0ca5702dcff85",
+      "@690c6b9702d7bcc761ae2d8976fe77e547255481",
 
     # Note that this is different from Android's freetype repo.
     "src/third_party/freetype2/src":
       Var("chromium_git") + "/chromium/src/third_party/freetype2.git" +
       "@d699c2994ecc178c4ed05ac2086061b2034c2178",
 
-    # Build tools for targeting ChromeOS.
+    # Build tools for Chrome OS.
     "src/third_party/chromite":
       Var("chromiumos_git") + "/chromite.git" +
-      "@371a0a5adec10a47f6040241b574b96b9bc00fbc",
+      "@38242c6c77b77bcfb887fa97f3735c3262310370",
 
     # Dependency of chromite.git.
     "src/third_party/pyelftools":
@@ -512,7 +508,7 @@ deps_os = {
   "android": {
     "src/third_party/android_tools":
       Var("chromium_git") + "/android_tools.git" +
-      "@e91e44dc29517115794a72eea554616d067925ae",
+      "@8301b711a9ac7de56e9a9ff3dee0b2ebfc9a380f",
 
     "src/third_party/aosp":
       "/trunk/deps/third_party/aosp@148330",
@@ -749,15 +745,6 @@ hooks = [
                 "-s", "src/buildtools/linux64/clang-format.sha1",
     ],
   },
-  {
-    # Remove clang-format binaries from third_party/clang_format/bin that
-    # aren't used anymore.
-    # TODO(jochen) remove this and the .gitignore entry after the end of July,
-    # 2014.
-    "name": "remove_old_clang_format_binaries",
-    "pattern": ".",
-    "action": ["python", "src/third_party/clang_format/bin/rm_binaries.py"],
-  },
   # Pull binutils for linux, enabled debug fission for faster linking /
   # debugging when used with clang on Ubuntu Precise.
   # https://code.google.com/p/chromium/issues/detail?id=352046