Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 151 insertions, 77 deletions

diff --git a/chromium/DEPS b/chromium/DEPS
index a986da55f4f..529f49ecd92 100644
--- a/chromium/DEPS
+++ b/chromium/DEPS
@@ -1,3 +1,14 @@
+# This file is automatically processed to create .DEPS.git which is the file
+# that gclient uses under git.
+#
+# See http://code.google.com/p/chromium/wiki/UsingGit
+#
+# To test manually, run:
+#   python tools/deps2git/deps2git.py -o .DEPS.git
+#   gclient runhooks
+# DO NOT CHECK IN CHANGES TO .DEPS.git. It will be automatically updated by
+# a bot when you modify this one.
+#
 # When adding a new dependency, please update the top-level .gitignore file
 # to list the dependency's destination directory.
 
@@ -8,74 +19,75 @@ vars = {
   "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
-  "webkit_revision": "158192",
+  "webkit_revision": "163968",
   "chromium_git": "https://chromium.googlesource.com",
   "chromiumos_git": "https://chromium.googlesource.com/chromiumos",
   "skia_git": "https://skia.googlesource.com",
-  "swig_revision": "69281",
-  "nacl_revision": "12181",
+  "swig_revision": "230490",
+  "nacl_revision": "12544",
   # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
   # to update other nacl_*_revision's.
-  "nacl_tools_revision": "11437",  # native_client/DEPS: tools_rev
+  "nacl_tools_revision": "12526",  # native_client/DEPS: tools_rev
   "gtm_revision": "616",
-
-  "libphonenumber_revision": "584",
-  "libvpx_revision": "224550",
+  "libaddressinput_revision": "176",
+  "libphonenumber_revision": "621",
+  "libvpx_revision": "240222",
   "lss_revision": "24",
 
   # These two FFmpeg variables must be updated together.  One is used for SVN
   # checkouts and the other for Git checkouts.
-  "ffmpeg_revision": "224426",
-  "ffmpeg_hash": "5879ccd47e649bf2dfaec45f02ec5517bd3621d2",
+  "ffmpeg_revision": "240434",
+  "ffmpeg_hash": "c6c988923be6b8fd1f381522d478813e14505ce2",
 
-  "sfntly_revision": "134",
-  "skia_revision": "11429",
-  "skia_hash": "6ae638c32047ce3ad550b06b0bc9b1e84a413c2a",
+  "sfntly_revision": "228",
+  "lighttpd_revision": "33737",
+  "skia_revision": "12678",
+  "skia_hash": "e132f5031fb700e34af1ea08b575b2c774393047",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.
-  "v8_revision": "16822",
+  "v8_revision": "18251",
   # 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": "4819",
+  "webrtc_revision": "5301",
   "jsoncpp_revision": "248",
-  "nss_revision": "223139",
+  "nss_revision": "239365",
   # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling swarm_client
+  # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
-  "swarm_revision": "224429",
+  "swarming_revision": "f89de358c2edb260e0ca8429c16d1037a4ec4fa4",
   # 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": "207965",
+  "openssl_revision": "236537",
 }
 
 deps = {
   "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1213",
+    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1253",
 
   "src/sdch/open-vcdiff":
     (Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
 
   "src/testing/gtest":
-    (Var("googlecode_url") % "googletest") + "/trunk@629",
+    (Var("googlecode_url") % "googletest") + "/trunk@643",
 
   "src/testing/gmock":
     (Var("googlecode_url") % "googlemock") + "/trunk@410",
 
-  "src/third_party/angle_dx11":
+  "src/third_party/angle":
     Var("chromium_git") +
-    "/external/angle.git@300b1eb5018651d2e68289a9dd234bbf906b3cc0",
+    "/angle/angle.git@95fa672f26db492aee2076b0acb524149d52c68f",
 
   "src/third_party/trace-viewer":
-    (Var("googlecode_url") % "trace-viewer") + "/trunk@1006",
+    (Var("googlecode_url") % "trace-viewer") + "/trunk@1069",
 
   "src/third_party/WebKit":
     Var("webkit_trunk") + "@" + Var("webkit_revision"),
 
   "src/third_party/icu":
-    "/trunk/deps/third_party/icu46@223384",
+    "/trunk/deps/third_party/icu46@239289",
 
   "src/third_party/libexif/sources":
     "/trunk/deps/third_party/libexif/sources@146817",
@@ -91,22 +103,23 @@ deps = {
 
   "src/third_party/cacheinvalidation/src":
     (Var("googlecode_url") % "google-cache-invalidation-api") +
-    "/trunk/src@313",
+    "/trunk/src@314",
 
   "src/third_party/leveldatabase/src":
-    (Var("googlecode_url") % "leveldb") + "/trunk@77",
+    (Var("googlecode_url") % "leveldb") + "/trunk@78",
 
   "src/third_party/snappy/src":
     (Var("googlecode_url") % "snappy") + "/trunk@80",
 
   "src/tools/grit":
-    (Var("googlecode_url") % "grit-i18n") + "/trunk@136",
+    (Var("googlecode_url") % "grit-i18n") + "/trunk@140",
 
   "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1735",
+    (Var("googlecode_url") % "gyp") + "/trunk@1806",
 
-  "src/tools/swarm_client":
-    "/trunk/tools/swarm_client@" + Var("swarm_revision"),
+  "src/tools/swarming_client":
+    Var("chromium_git") + "/external/swarming.client.git@" +
+        Var("swarming_revision"),
 
   "src/v8":
     (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
@@ -132,7 +145,11 @@ deps = {
     (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
 
   "src/third_party/ots":
-    (Var("googlecode_url") % "ots") + "/trunk@102",
+    (Var("googlecode_url") % "ots") + "/trunk@107",
+
+  "src/third_party/brotli/src":
+    Var("chromium_git") +
+    "/external/font-compression-reference.git@fe79fac8da1ec850d94679705a6f3405153f51dd",
 
   "src/tools/page_cycler/acid3":
     "/trunk/deps/page_cycler/acid3@171600",
@@ -149,10 +166,9 @@ deps = {
   "src/third_party/bidichecker":
     (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4",
 
-  # When roll to another webgl conformance tests revision, please goto
-  # chrome/test/gpu and run generate_webgl_conformance_test_list.py.
-  "src/third_party/webgl_conformance":
-    "/trunk/deps/third_party/webgl/sdk/tests@218717",
+  "src/third_party/webgl/src":
+    Var("chromium_git") +
+    "/external/khronosgroup/webgl.git@159f31dd34842c871032d97d360a9dce5153f585",
 
   "src/third_party/swig/Lib":
     "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
@@ -170,12 +186,11 @@ deps = {
     Var("ffmpeg_revision"),
 
   "src/third_party/libjingle/source/talk":
-    (Var("googlecode_url") % "webrtc") + "/stable/talk@" +
-    Var("webrtc_revision"),
+    (Var("googlecode_url") % "webrtc") + "/branches/3.48/talk@5413",
 
   "src/third_party/usrsctp/usrsctplib":
     (Var("googlecode_url") % "sctp-refimpl") +
-    "/trunk/KERN/usrsctp/usrsctplib@8603",
+    "/trunk/KERN/usrsctp/usrsctplib@8723",
 
   "src/third_party/libsrtp":
     "/trunk/deps/third_party/libsrtp@214783",
@@ -187,7 +202,7 @@ deps = {
     "/trunk/deps/third_party/yasm/patched-yasm@167605",
 
   "src/third_party/libjpeg_turbo":
-    "/trunk/deps/third_party/libjpeg_turbo@228394",
+    "/trunk/deps/third_party/libjpeg_turbo@239583",
 
   "src/third_party/flac":
     "/trunk/deps/third_party/flac@222897",
@@ -203,7 +218,7 @@ deps = {
     (Var("googlecode_url") % "webrtc") + "/stable/webrtc@" + Var("webrtc_revision"),
 
   "src/third_party/openmax_dl":
-    (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@4261",
+    (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@5205",
 
   "src/third_party/jsoncpp/source/include":
     (Var("sourceforge_url") % {"repo": "jsoncpp"}) +
@@ -214,41 +229,45 @@ deps = {
         "/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"),
 
   "src/third_party/libyuv":
-    (Var("googlecode_url") % "libyuv") + "/trunk@723",
+    (Var("googlecode_url") % "libyuv") + "/trunk@911",
 
   "src/third_party/smhasher/src":
     (Var("googlecode_url") % "smhasher") + "/trunk@149",
 
+  "src/third_party/libaddressinput/src/cpp":
+    (Var("googlecode_url") % "libaddressinput") + "/trunk/cpp@" +
+        Var("libaddressinput_revision"),
+  "src/third_party/libaddressinput/src/testdata":
+    (Var("googlecode_url") % "libaddressinput") + "/trunk/testdata@" +
+        Var("libaddressinput_revision"),
+
   "src/third_party/libphonenumber/src/phonenumbers":
-     (Var("googlecode_url") % "libphonenumber") +
-         "/trunk/cpp/src/phonenumbers@" + Var("libphonenumber_revision"),
+    (Var("googlecode_url") % "libphonenumber") +
+        "/trunk/cpp/src/phonenumbers@" + Var("libphonenumber_revision"),
   "src/third_party/libphonenumber/src/test":
-     (Var("googlecode_url") % "libphonenumber") + "/trunk/cpp/test@" +
-         Var("libphonenumber_revision"),
+    (Var("googlecode_url") % "libphonenumber") + "/trunk/cpp/test@" +
+        Var("libphonenumber_revision"),
   "src/third_party/libphonenumber/src/resources":
-     (Var("googlecode_url") % "libphonenumber") + "/trunk/resources@" +
-         Var("libphonenumber_revision"),
+    (Var("googlecode_url") % "libphonenumber") + "/trunk/resources@" +
+        Var("libphonenumber_revision"),
 
   "src/tools/deps2git":
-    "/trunk/tools/deps2git@214390",
+    "/trunk/tools/deps2git@236839",
 
   "src/third_party/webpagereplay":
-    (Var("googlecode_url") % "web-page-replay") + "/trunk@521",
+    (Var("googlecode_url") % "web-page-replay") + "/trunk@528",
 
   "src/third_party/pywebsocket/src":
     (Var("googlecode_url") % "pywebsocket") + "/trunk/src@662",
 
   "src/third_party/opus/src":
-    "/trunk/deps/third_party/opus@185324",
-
-  "src/third_party/accessibility-developer-tools":
-    Var("chromium_git") + "/external/accessibility-developer-tools.git@2e3c9c8e49277a0ca1eeba510271eb03f9486d8f",
+    "/trunk/deps/third_party/opus@237544",
 
   "src/media/cdm/ppapi/api":
-    "/trunk/deps/cdm@181763",
+    "/trunk/deps/cdm@237635",
 
   "src/third_party/mesa/src":
-    "/trunk/deps/third_party/mesa@210110",
+    "/trunk/deps/third_party/mesa@229994",
 
   "src/third_party/cld_2/src":
     (Var("googlecode_url") % "cld2") + "/trunk@84",
@@ -258,16 +277,16 @@ deps = {
 deps_os = {
   "win": {
     "src/chrome/tools/test/reference_build/chrome_win":
-      "/trunk/deps/reference_builds/chrome_win@221746",
+      "/trunk/deps/reference_builds/chrome_win@237381",
 
     "src/third_party/cygwin":
-      "/trunk/deps/third_party/cygwin@133786",
+      "/trunk/deps/third_party/cygwin@231940",
 
     "src/third_party/python_26":
       "/trunk/tools/third_party/python_26@89111",
 
     "src/third_party/psyco_win32":
-      "/trunk/deps/third_party/psyco_win32@79861",
+      "/trunk/deps/third_party/psyco_win32@237949",
 
     "src/third_party/bison":
       "/trunk/deps/third_party/bison@147303",
@@ -279,7 +298,7 @@ deps_os = {
       "/trunk/deps/third_party/perl@147900",
 
     "src/third_party/lighttpd":
-      "/trunk/deps/third_party/lighttpd@33727",
+      "/trunk/deps/third_party/lighttpd@" + Var("lighttpd_revision"),
 
     # Chrome Frame related deps
     "src/third_party/xulrunner-sdk":
@@ -314,7 +333,7 @@ deps_os = {
     # Binary level profile guided optimizations. This points to the
     # latest release binaries for the toolchain.
     "src/third_party/syzygy/binaries":
-      (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@1770",
+      (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@1909",
 
     # Binaries for nacl sdk.
     "src/third_party/nacl_sdk_binaries":
@@ -337,37 +356,38 @@ deps_os = {
     "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": None,
     "src/chrome/test/data/perf/canvas_bench": None,
     "src/chrome/test/data/perf/frame_rate/content": None,
+    "src/chrome/test/data/perf/third_party/octane": None,
+    "src/media/cdm/ppapi/api": None,
     "src/native_client": None,
     "src/native_client/src/third_party/ppapi": None,
-    "src/third_party/angle_dx11": None,
-    "src/third_party/cld_2/src": None,
+    "src/third_party/angle": None,
     "src/third_party/bidichecker": None,
-    "src/third_party/webgl_conformance": None,
+    "src/third_party/cld_2/src": None,
     "src/third_party/ffmpeg": None,
     "src/third_party/hunspell_dictionaries": None,
     "src/third_party/hunspell": None,
-    "src/third_party/leveldatabase/src": None,
+    "src/third_party/libaddressinput/src/cpp": None,
+    "src/third_party/libaddressinput/src/testdata": None,
     "src/third_party/libexif/sources": None,
     "src/third_party/libjpeg_turbo": None,
-    "src/third_party/libphonenumber/src/phonenumbers": None,
-    "src/third_party/libphonenumber/src/test": None,
-    "src/third_party/libphonenumber/src/resources": None,
     "src/third_party/libsrtp": None,
-    "src/third_party/usrsctp/usrsctplib": 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,
     "src/third_party/ots": None,
-    "src/third_party/pylib": None,
     "src/third_party/pymox/src": None,
     "src/third_party/safe_browsing/testing": None,
     "src/third_party/scons-2.0.1": None,
     "src/third_party/sfntly/cpp/src": None,
     "src/third_party/smhasher/src": None,
-    "src/third_party/snappy/src": None,
     "src/third_party/swig/Lib": None,
     "src/third_party/undoview": None,
+    "src/third_party/usrsctp/usrsctplib": None,
     "src/third_party/v8-i18n": None,
     "src/third_party/webdriver/pylib": None,
+    "src/third_party/webgl": None,
     "src/third_party/webpagereplay": None,
     "src/third_party/webrtc": None,
     "src/third_party/yasm/source/patched-yasm": None,
@@ -376,7 +396,7 @@ deps_os = {
   },
   "mac": {
     "src/chrome/tools/test/reference_build/chrome_mac":
-      "/trunk/deps/reference_builds/chrome_mac@221746",
+      "/trunk/deps/reference_builds/chrome_mac@237381",
 
     "src/third_party/GTM":
       (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@" +
@@ -384,7 +404,7 @@ deps_os = {
     "src/third_party/pdfsqueeze":
       (Var("googlecode_url") % "pdfsqueeze") + "/trunk@5",
     "src/third_party/lighttpd":
-      "/trunk/deps/third_party/lighttpd@33737",
+      "/trunk/deps/third_party/lighttpd@" + Var("lighttpd_revision"),
 
     "src/third_party/swig/mac":
       "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"),
@@ -394,12 +414,12 @@ deps_os = {
       "/trunk/deps/third_party/nss@" + Var("nss_revision"),
 
     "src/chrome/installer/mac/third_party/xz/xz":
-      "/trunk/deps/third_party/xz@189101",
+      "/trunk/deps/third_party/xz@233311",
   },
   "unix": {
     # Linux, really.
     "src/chrome/tools/test/reference_build/chrome_linux":
-      "/trunk/deps/reference_builds/chrome_linux@221746",
+      "/trunk/deps/reference_builds/chrome_linux64@237381",
 
     "src/third_party/xdg-utils":
       "/trunk/deps/third_party/xdg-utils@203785",
@@ -415,7 +435,7 @@ deps_os = {
       "/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
 
     "src/third_party/gold":
-      "/trunk/deps/third_party/gold@203758",
+      "/trunk/deps/third_party/gold@228995",
 
     "src/third_party/libmtp":
       "/trunk/deps/third_party/libmtp@206535",
@@ -433,7 +453,7 @@ deps_os = {
     # For Linux and Chromium OS.
     "src/third_party/cros_system_api":
       Var("chromiumos_git") + "/platform/system_api.git" +
-      "@205bfa55bbf3287769a600d7fa29e000d0ff085e",
+      "@cfa23a554dcb262bfac10f9f5ac624d26c8c4e38",
 
     # Note that this is different from Android's freetype repo.
     "src/third_party/freetype2/src":
@@ -452,11 +472,16 @@ deps_os = {
 
     "src/third_party/undoview":
       "/trunk/deps/third_party/undoview@119694",
+
+    "src/third_party/liblouis/src":
+      Var("chromium_git") +
+      "/external/liblouis.git@3c2daee56250162e5a75830871601d74328d39f5",
+
   },
   "android": {
     "src/third_party/android_tools":
       Var("chromium_git") + "/android_tools.git" +
-      "@e504b737693e96816b40e6ae80d177352c079c18",
+      "@25cf2d85072b06f78956ecaacd564ef56a054d65",
 
     "src/third_party/aosp":
       "/trunk/deps/third_party/aosp@148330",
@@ -496,6 +521,10 @@ deps_os = {
 
     "src/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille":
       (Var("googlecode_url") % "eyes-free") + "/trunk/braille/client/src/com/googlecode/eyesfree/braille@797",
+
+    # Android shouldn't use this address validation library.
+    "src/third_party/libaddressinput/src/cpp": None,
+    "src/third_party/libaddressinput/src/testdata": None,
   },
 }
 
@@ -611,6 +640,51 @@ hooks = [
                "-s", "src/third_party/WebKit",
                "-o", "src/build/util/LASTCHANGE.blink"],
   },
+  # Pull GN binaries. This needs to be before running GYP below.
+  {
+    "name": "gn_win",
+    "pattern": "src/tools/gn/bin/win/gn.exe.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=win32",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", "src/tools/gn/bin/win/gn.exe.sha1",
+    ],
+  },
+  {
+    "name": "gn_mac",
+    "pattern": "src/tools/gn/bin/mac/gn.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=darwin",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", "src/tools/gn/bin/mac/gn.sha1",
+    ],
+  },
+  {
+    "name": "gn_linux",
+    "pattern": "src/tools/gn/bin/linux/gn.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=linux*",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", "src/tools/gn/bin/linux/gn.sha1",
+    ],
+  },
+  {
+    "name": "gn_linux32",
+    "pattern": "src/tools/gn/bin/linux/gn32.sha1",
+    "action": [ "download_from_google_storage",
+                "--no_resume",
+                "--platform=linux*",
+                "--no_auth",
+                "--bucket", "chromium-gn",
+                "-s", "src/tools/gn/bin/linux/gn32.sha1",
+    ],
+  },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "name": "gyp",