Linux: Call the install-debian-sysroot scripts directly instead of via a wrapper, now that the scri…

DEPS

 # When adding a new dependency, please update the top-level .gitignore file
 # to list the dependency's destination directory.
 
 vars = {
   # Use this googlecode_url variable only if there is an internal mirror for it.
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
@@ skipping 619 matching lines @@
   {
     # Downloads an ARM sysroot image to src/arm-sysroot. This image updates
     # at about the same rate that the chrome build deps change.
     # This script is a no-op except for linux users who have
     # target_arch=arm in their GYP_DEFINES.
     "pattern": ".",
     "action": ["python", "src/build/linux/install-arm-sysroot.py",
                "--linux-only"],
   },
   {
-    # Downloads the Debian Wheezy sysroot to chrome/installer/linux/internal
-    # if needed. This sysroot updates at about the same rate that the chrome
-    # build deps change. This script is a no-op except for linux users who have
-    # src-internal access and are doing official chrome builds.
+    # Downloads the Debian Wheezy sysroot to chrome/installer/linux if needed.
+    # This sysroot updates at about the same rate that the chrome build deps
+    # change. This script is a no-op except for linux users who are doing
+    # official chrome builds.
     "pattern": ".",
-    "action": ["python",
-               "src/build/linux/install-debian.wheezy.sysroot.wrapper.py"],
+    "action": [
+        "python",
+        "src/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py",
+        "--linux-only",
+        "--arch=amd64"],
+  },
+  {
+    # Same as above, but for 32-bit Linux.
+    "pattern": ".",
+    "action": [
+        "python",
+        "src/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py",
+        "--linux-only",
+        "--arch=i386"],
   },
   {
     # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
     # zero seconds to run. If something changed, it downloads a prebuilt clang,
     # which takes ~20s, but clang speeds up builds by more than 20s.
     "pattern": ".",
     "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"],
   },
   {
     # Update the cygwin mount on Windows.
@@ skipping 19 matching lines @@
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
     "action": ["python", "src/build/gyp_chromium"],
   },
   {
     # Check for landmines (reasons to clobber the build).
     "pattern": ".",
     "action": ["python", "src/build/landmines.py"],
   },
 ]