diff --git a/.DEPS.git b/.DEPS.git
index 94d6345..3d1ff7c 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,24 +1,44 @@
 # DO NOT EDIT EXCEPT FOR LOCAL TESTING.
 # THIS IS A GENERATED FILE.
 # ALL MANUAL CHANGES WILL BE OVERWRITTEN.
-# SEE http://code.google.com/p/chromium/wiki/UsingNewGit
+# SEE http://code.google.com/p/chromium/wiki/UsingGit
 # FOR HOW TO ROLL DEPS
 vars = {
-    'ffmpeg_hash':
-         '@23f177366e3bce3a628a7d3feedceed4e18dcc04',
     'webkit_url':
-         'http://git.chromium.org/external/WebKit_trimmed.git',
+         'https://chromium.googlesource.com/chromium/blink.git',
     'git_url':
-         'http://git.chromium.org',
+         'https://chromium.googlesource.com',
     'webkit_rev':
-         '@3c8b491c12f1192a7bb268cbbd8f5e772d11a2f6'
+         '@1d1ef4bfd80cb9f8855a238a648d09835e602600',
+    'angle_revision':
+         'bceb4183347c06eab6f18d664aa068369df6f3dd'
 }
 
 deps = {
+    'build':
+        Var('git_url') + '/chromium/tools/build.git@8c2046f5681464e5dea3f20be3867ff3338f1d23',
+    'build/scripts/command_wrapper/bin':
+        Var('git_url') + '/chromium/tools/command_wrapper/bin.git@2eeebba9a512cae9e4e9312f5ec728dbdad80bd0',
+    'build/scripts/gsd_generate_index':
+        Var('git_url') + '/chromium/tools/gsd_generate_index.git@5ece0953c2b4eebcc9011d94e41588229fc9de9b',
+    'build/scripts/private/data/reliability':
+        Var('git_url') + '/chromium/src.git@48f85e445b0182015140038745c3896b13404b9e',
+    'build/third_party/gsutil':
+        Var('git_url') + '/external/gsutil/src.git@3ae724bed3c59a309fa87acc7e6b745c6e555e2f',
+    'build/third_party/lighttpd':
+        Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+    'chromeos':
+        Var('git_url') + '/chromium/src.git@237c404691c13d4932e8b29198c6183b51479c09',
+    'commit-queue':
+        Var('git_url') + '/chromium/tools/commit-queue.git@d157134ca4ecd5f8fca434651bbcaae23a3d962c',
+    'depot_tools':
+        Var('git_url') + '/chromium/tools/depot_tools.git@e84b7541ce1bb3d5867fd3de48e446c979af4c01',
+    'src':
+        Var('git_url') + '/chromium/src.git@a683643c0dc0a312cd82ce044ea9c360ab734130',
     'src/breakpad/src':
         Var('git_url') + '/external/google-breakpad/src.git@ae15c8e2d8ac41b62b24cf62f04076473df3950c',
     'src/chrome/browser/resources/software_rendering_list':
-        Var('git_url') + '/chromium/deps/gpu/software_rendering_list.git@d5695c2e38a22f326a68919e0fe3df69057e21f1',
+        Var('git_url') + '/chromium/deps/gpu/software_rendering_list.git@672a3f5802b48ae8e044ec764bb3f04616f68115',
     'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
         Var('git_url') + '/native_client/src/native_client/tests/prebuilt.git@3e17365176c94624f46cace174f61834b7f3c35d',
     'src/chrome/test/data/perf/canvas_bench':
@@ -40,15 +60,15 @@
     'src/testing/gtest':
         Var('git_url') + '/external/googletest.git@361c8fbbc15e74730908e28660cb742eba046a83',
     'src/third_party/WebKit':
-        Var('webkit_url') + Var('webkit_rev'),
+        Var('git_url') + '/external/WebKit_trimmed.git' + Var('webkit_rev'),
     'src/third_party/angle':
-        Var('git_url') + '/external/angleproject.git@001470bb5bff47d1f3f68943a45bf53803a2b623',
+        Var('git_url') + '/external/angleproject.git' + '@' + Var('angle_revision'),
     'src/third_party/bidichecker':
         Var('git_url') + '/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0',
     'src/third_party/cacheinvalidation/files/src/google':
         Var('git_url') + '/external/google-cache-invalidation-api/src/google.git@b6874a1e50bb7c8fe042828b1a0b017efb515365',
     'src/third_party/ffmpeg':
-        Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+        Var('git_url') + '/chromium/deps/ffmpeg.git@5e1d0f0a9202445aa6dcb366130323c62aa863f4',
     'src/third_party/flac':
         Var('git_url') + '/chromium/deps/flac.git@2ba6d0b1b74de09ae4b1f04399127b4aaa20e070',
     'src/third_party/hunspell':
@@ -66,7 +86,7 @@
     'src/third_party/libexif/sources':
         Var('git_url') + '/chromium/deps/libexif/sources.git@8d0c7aa0dfba6ca7ca4589a6e029f72c66a4ff57',
     'src/third_party/libjingle/source':
-        Var('git_url') + '/external/libjingle.git@e979669e9b74387aa8d0adcfa39f92489a64bea2',
+        Var('git_url') + '/external/libjingle.git@d603a2872c59f843ba92c794c2e30da9ba649e87',
     'src/third_party/libjpeg_turbo':
         Var('git_url') + '/chromium/deps/libjpeg_turbo.git@93d4a90c2661e2dff2d9ed9d358d0abaa3d7d763',
     'src/third_party/libphonenumber/src/phonenumbers':
@@ -100,9 +120,9 @@
     'src/third_party/sfntly/cpp/src':
         Var('git_url') + '/external/sfntly/cpp/src.git@127cef2a54a5b6e6777761d550c1ec90e736383f',
     'src/third_party/skia/include':
-        Var('git_url') + '/external/skia/include.git@36319a981e4883628f04f5ae2dc865eddee0a8eb',
+        Var('git_url') + '/external/skia/include.git@b47ba34ba3448e8e02c029cc6ab89315b7607f02',
     'src/third_party/skia/src':
-        Var('git_url') + '/external/skia/src.git@7ca978d22eba246c0df5c659afd84b21a1938686',
+        Var('git_url') + '/external/skia/src.git@2e7d9649c67322e5a98b1a75c6b13b460cb32e57',
     'src/third_party/smhasher/src':
         Var('git_url') + '/external/smhasher.git@b35e562e2d80bc47a51b53ec92a305eb9a3383b4',
     'src/third_party/snappy/src':
@@ -116,7 +136,7 @@
     'src/third_party/undoview':
         Var('git_url') + '/chromium/deps/undoview.git@3ba503e248f3cdbd81b78325a24ece0984637559',
     'src/third_party/v8-i18n':
-        Var('git_url') + '/external/v8-i18n.git@b422aad6e7ddc48e6f8fd3a15318026e4b5447f0',
+        Var('git_url') + '/external/v8-i18n.git@d7852687d80c2fe3e7d0d9a484dd8730f5739bac',
     'src/third_party/webdriver/pylib':
         Var('git_url') + '/external/selenium/py.git@304801aede8d4b52a30657201aefed7479c0c9dd',
     'src/third_party/webgl_conformance':
@@ -124,19 +144,19 @@
     'src/third_party/webpagereplay':
         Var('git_url') + '/external/web-page-replay.git@d8d5c2f1c9f9bd9150e9419ead7d6120e4664666',
     'src/third_party/webrtc':
-        Var('git_url') + '/external/webrtc/stable/src.git@e6b8c0a0918d5ee2832cc95957eae1f6798ba123',
+        Var('git_url') + '/external/webrtc/src.git@c82d7511b971ac4bb368c19ca9891a26d0472b1a',
     'src/third_party/yasm/source/patched-yasm':
         Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@f164a228f51c17ffc3ed69516a7dc6abdf2d2c8e',
     'src/tools/deps2git':
         Var('git_url') + '/chromium/tools/deps2git.git@4bd664b0d9a7263ac562aa98802c2c6cfab87871',
     'src/tools/grit':
-        Var('git_url') + '/external/grit-i18n.git@ec8016c73b3b945b6284746230913d88653f35e7',
+        Var('git_url') + '/external/grit-i18n.git@6f3e2fb1efdb097c4981179771985e71520934c0',
     'src/tools/gyp':
         Var('git_url') + '/external/gyp.git@9cb333281ac8e034ba14dee42de51dd79fe76551',
     'src/tools/page_cycler/acid3':
         Var('git_url') + '/chromium/deps/acid3.git@633fc66cc99ae5bb92b567c6beafde7a01cfdb49',
     'src/v8':
-        Var('git_url') + '/external/v8.git@5091559f9e984140e5a1d0fe4951ad435866e0e4',
+        Var('git_url') + '/external/v8.git@a51bfbcfc85239035211e2c4c425159921792528',
 }
 
 deps_os = {
@@ -145,14 +165,14 @@
         'src/third_party/aosp':
             Var('git_url') + '/chromium/deps/aosp.git@1348f2caa089cd4f64c8cc27041cdd640f1d3e89',
         'src/third_party/freetype':
-            Var('git_url') + '/git/chromium/src/third_party/freetype.git@1f74e4e7ad3ca4163b4578fc30da26a165dd55e7',
+            'http://git.chromium.org/git/chromium/src/third_party/freetype.git@1f74e4e7ad3ca4163b4578fc30da26a165dd55e7',
     },
     'mac':
     {
         'src/chrome/installer/mac/third_party/xz/xz':
             Var('git_url') + '/chromium/deps/xz.git@604fa85cc4e214aa0f418a2596ea865c0eed7a54',
         'src/chrome/tools/test/reference_build/chrome_mac':
-            Var('git_url') + '/chromium/reference_builds/chrome_mac.git@b43b0539e14bf908e771dbbf0b080f7dc9b75219',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
         'src/rlz':
             Var('git_url') + '/external/rlz.git@f36b420aa0963d07215813f3f862be1794c2ce55',
         'src/third_party/GTM':
@@ -168,8 +188,18 @@
     },
     'unix':
     {
+        'build/third_party/cbuildbot_chromite':
+            Var('git_url') + '/chromiumos/chromite.git',
+        'build/third_party/xvfb':
+            Var('git_url') + '/chromium/tools/third_party/xvfb.git@aebb1aadf1422e4d81e831e13746b8f7ae322e07',
+        'build/xvfb':
+            Var('git_url') + '/chromium/tools/xvfb.git@077af3535e54dbb782a355b81ba69ea17ec6bde5',
         'src/chrome/tools/test/reference_build/chrome_linux':
-            Var('git_url') + '/chromium/reference_builds/chrome_linux.git@53d4cfaf7032086779f2f4f40a9b6f21b7dbc3bf',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
+        'src/third_party/cros':
+            'http://git.chromium.org/chromiumos/platform/cros.git@377f51d8',
+        'src/third_party/cros_system_api':
+            'http://git.chromium.org/chromiumos/platform/system_api.git@a6b76c4e',
         'src/third_party/gold':
             Var('git_url') + '/chromium/deps/gold.git@44ab2e796b8126864b4860eb108dbf5068887063',
         'src/third_party/lss':
@@ -184,9 +214,9 @@
     'win':
     {
         'src/chrome/tools/test/reference_build/chrome_win':
-            Var('git_url') + '/chromium/reference_builds/chrome_win.git@fc239c7dcabcd2a225c281963eedb6a5441fb13b',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
         'src/chrome_frame/tools/test/reference_build/chrome_win':
-            Var('git_url') + '/chromium/reference_builds/chrome_win.git@b9f52667918a74977cb85eefd4e967150f852fbc',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
         'src/rlz':
             Var('git_url') + '/external/rlz.git@f36b420aa0963d07215813f3f862be1794c2ce55',
         'src/third_party/cygwin':
diff --git a/DEPS b/DEPS
index ecaeb15..d370edff 100644
--- a/DEPS
+++ b/DEPS
@@ -1,559 +1,293 @@
-# When adding a new dependency, please update the top-level .gitignore file
-# to list the dependency's destination directory.
+#  
+#  To use this DEPS file to re-create a Chromium release you
+#  need the tools from http://dev.chromium.org installed.
+#  
+#  This DEPS file corresponds to Chromium 21.0.1180.84
+#  
+#  
+#  
+vars =  {'webkit_trunk': 'http://svn.webkit.org/repository/webkit/trunk'} 
 
-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://svn.webkit.org/repository/webkit/trunk",
-  "nacl_trunk": "http://src.chromium.org/native_client/trunk",
-  "webkit_revision": "120591",
-  "chromium_git": "http://git.chromium.org/git",
-  "swig_revision": "69281",
-  "nacl_revision": "8950",
-  # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
-  # to update other nacl_*_revision's.
-  "nacl_tools_revision": "8673",  # native_client/DEPS: tools_rev
-
-  # These hashes need to be updated when nacl_toolchain_revision is changed.
-  # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
-  # new values.
-  "nacl_toolchain_linux_x86_hash":
-      "d82ef6eea6ff6ba427efa70461c2fc411d64569f",
-  "nacl_toolchain_linux_x86_newlib_hash":
-      "849a8cf371e17a685b9429a69474f328454b5e06",
-  "nacl_toolchain_mac_x86_hash":
-      "42575a21646027d52778240c03246d4534c98956",
-  "nacl_toolchain_mac_x86_newlib_hash":
-      "4f072a30b55ce9088ed6c6a0033dffa3a8ae301b",
-  "nacl_toolchain_pnacl_linux_x86_32_hash":
-      "5b56a39c2bb63f35c731c76fb0a28d9039f18126",
-  "nacl_toolchain_pnacl_linux_x86_64_hash":
-      "02fb84aaf805eb33774e85de34adc1906df3c81f",
-  "nacl_toolchain_pnacl_mac_x86_32_hash":
-      "28fdc9843cc2c920ba5a252c8884037903daa19c",
-  "nacl_toolchain_pnacl_translator_hash":
-      "4be9f32463a1687a385b072071c0cd8c36a69aac",
-  "nacl_toolchain_pnacl_win_x86_32_hash":
-      "9f276642818cb92a2ffb63988d346376b66d3b7b",
-  "nacl_toolchain_win_x86_hash":
-      "85d9b16cb503a10963654803c4a4f90ea6edfff2",
-  "nacl_toolchain_win_x86_newlib_hash":
-      "cd4f8209a6f87d8baf21d1610928a3def4306764",
-  "nacl_toolchain_revision": "8715",
-  "pnacl_toolchain_revision": "8847",
-
-  "libjingle_revision": "157",
-  "libphonenumber_revision": "456",
-  "libvpx_revision": "134182",
-  "lss_revision": "11",
-
-  # These two FFmpeg variables must be updated together.  One is used for SVN
-  # checkouts and the other for Git checkouts.
-  "ffmpeg_revision": "142289",
-  "ffmpeg_hash": "23f177366e3bce3a628a7d3feedceed4e18dcc04",
-
-  "sfntly_revision": "128",
-  "skia_revision": "4276",
-  # 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": "11844",
-  "webrtc_revision": "2406",
-  "jsoncpp_revision": "248",
-  "nss_revision": "142261",
-  "rlz_revision": "130",
+deps_os = {
+   'win': {
+      'src/third_party/yasm/binaries':
+      '/trunk/deps/third_party/yasm/binaries@74228',
+      'src/third_party/nacl_sdk_binaries':
+      '/trunk/deps/third_party/nacl_sdk_binaries@111576',
+      'src/third_party/pefile':
+      'http://pefile.googlecode.com/svn/trunk@63',
+      'src/third_party/swig/win':
+      '/trunk/deps/third_party/swig/win@69281',
+      'src/third_party/lighttpd':
+      '/trunk/deps/third_party/lighttpd@33727',
+      'src/chrome/tools/test/reference_build/chrome_win':
+      '/trunk/deps/reference_builds/chrome_win@137747',
+      'src/rlz':
+      'http://rlz.googlecode.com/svn/trunk@130',
+      'src/third_party/xulrunner-sdk':
+      '/trunk/deps/third_party/xulrunner-sdk@119756',
+      'src/third_party/gnu_binutils':
+      'http://src.chromium.org/native_client/trunk/deps/third_party/gnu_binutils@8673',
+      'src/third_party/psyco_win32':
+      '/trunk/deps/third_party/psyco_win32@79861',
+      'src/third_party/mingw-w64/mingw/bin':
+      'http://src.chromium.org/native_client/trunk/deps/third_party/mingw-w64/mingw/bin@8673',
+      'src/chrome_frame/tools/test/reference_build/chrome_win':
+      '/trunk/deps/reference_builds/chrome_win@89574',
+      'src/third_party/cygwin':
+      '/trunk/deps/third_party/cygwin@133786',
+      'src/third_party/python_26':
+      '/trunk/tools/third_party/python_26@89111',
+      'src/third_party/syzygy/binaries':
+      'http://sawbuck.googlecode.com/svn/trunk/syzygy/binaries@782',
+      'src/third_party/nss':
+      '/trunk/deps/third_party/nss@142261',
+   },
+   'mac': {
+      'src/rlz':
+      'http://rlz.googlecode.com/svn/trunk@130',
+      'src/third_party/GTM':
+      'http://google-toolbox-for-mac.googlecode.com/svn/trunk@516',
+      'src/third_party/pdfsqueeze':
+      'http://pdfsqueeze.googlecode.com/svn/trunk@4',
+      'src/chrome/installer/mac/third_party/xz/xz':
+      '/trunk/deps/third_party/xz@87706',
+      'src/third_party/swig/mac':
+      '/trunk/deps/third_party/swig/mac@69281',
+      'src/chrome/tools/test/reference_build/chrome_mac':
+      '/trunk/deps/reference_builds/chrome_mac@137727',
+      'src/third_party/lighttpd':
+      '/trunk/deps/third_party/lighttpd@33737',
+      'src/third_party/nss':
+      '/trunk/deps/third_party/nss@142261',
+   },
+   'unix': {
+      'src/third_party/gold':
+      '/trunk/deps/third_party/gold@124239',
+      'src/third_party/swig/linux':
+      '/trunk/deps/third_party/swig/linux@69281',
+      'src/third_party/WebKit/Tools/gdb':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/Tools/gdb@126646',
+      'src/third_party/cros':
+      'http://git.chromium.org/chromiumos/platform/cros.git@377f51d8',
+      'src/third_party/xdg-utils':
+      '/trunk/deps/third_party/xdg-utils@93299',
+      'build/xvfb':
+      '/trunk/tools/xvfb@121100',
+      'src/third_party/openssl':
+      '/trunk/deps/third_party/openssl@130472',
+      'build/third_party/xvfb':
+      '/trunk/tools/third_party/xvfb@125214',
+      'build/third_party/cbuildbot_chromite':
+      'https://git.chromium.org/chromiumos/chromite.git',
+      'src/third_party/lss':
+      'http://linux-syscall-support.googlecode.com/svn/trunk/lss@11',
+      'src/third_party/cros_system_api':
+      'http://git.chromium.org/chromiumos/platform/system_api.git@a6b76c4e',
+      'src/chrome/tools/test/reference_build/chrome_linux':
+      '/trunk/deps/reference_builds/chrome_linux@137712',
+   },
+   'android': {
+      'src/third_party/aosp':
+      '/trunk/deps/third_party/aosp@122156',
+      'src/third_party/freetype':
+      'http://git.chromium.org/git/chromium/src/third_party/freetype.git@1f74e4e7ad3ca4163b4578fc30da26a165dd55e7',
+   },
 }
 
 deps = {
-  "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@970",
-
-  "src/googleurl":
-    (Var("googlecode_url") % "google-url") + "/trunk@175",
-
-  "src/seccompsandbox":
-    (Var("googlecode_url") % "seccompsandbox") + "/trunk@186",
-
-  "src/sdch/open-vcdiff":
-    (Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
-
-  "src/testing/gtest":
-    (Var("googlecode_url") % "googletest") + "/trunk@613",
-
-  "src/testing/gmock":
-    (Var("googlecode_url") % "googlemock") + "/trunk@405",
-
-  "src/third_party/angle":
-    (Var("googlecode_url") % "angleproject") + "/trunk@1046",
-
-  "src/third_party/trace-viewer":
-    (Var("googlecode_url") % "trace-viewer") + "/trunk@26",
-
-  # Note that this is *not* where we check out WebKit -- this just
-  # puts some extra files into place for the real WebKit checkout to
-  # happen.  See lines mentioning "webkit_revision" for the real
-  # WebKit checkout.
-  "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@76115",
-
-  "src/third_party/icu":
-    "/trunk/deps/third_party/icu46@140144",
-
-  "src/third_party/libexif/sources":
-    "/trunk/deps/third_party/libexif/sources@141967",
-
-  "src/third_party/hunspell":
-   "/trunk/deps/third_party/hunspell@132738",
-
-  "src/third_party/hunspell_dictionaries":
-    "/trunk/deps/third_party/hunspell_dictionaries@138928",
-
-  "src/third_party/safe_browsing/testing":
-    (Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@110",
-
-  "src/third_party/cacheinvalidation/files/src/google":
-    (Var("googlecode_url") % "google-cache-invalidation-api") +
-    "/trunk/src/google@218",
-
-  "src/third_party/leveldatabase/src":
-    (Var("googlecode_url") % "leveldb") + "/trunk@64",
-
-  "src/third_party/snappy/src":
-    (Var("googlecode_url") % "snappy") + "/trunk@37",
-
-  "src/tools/grit":
-    (Var("googlecode_url") % "grit-i18n") + "/trunk@51",
-
-  "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1416",
-
-  "src/v8":
-    (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
-
-  "src/native_client":
-    Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
-
-  "src/native_client_sdk/src/site_scons":
-    Var("nacl_trunk") + "/src/native_client/site_scons@" + Var("nacl_revision"),
-
-  "src/third_party/pymox/src":
-    (Var("googlecode_url") % "pymox") + "/trunk@70",
-
-  "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
-    Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
-    Var("nacl_revision"),
-
-  "src/third_party/sfntly/cpp/src":
-    (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" +
-    Var("sfntly_revision"),
-
-  "src/third_party/skia/src":
-    (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"),
-
-  "src/third_party/skia/include":
-    (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
-
-  "src/third_party/WebKit/LayoutTests":
-    Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
-
-  "src/third_party/WebKit/Source":
-    Var("webkit_trunk") + "/Source@" + Var("webkit_revision"),
-
-  "src/third_party/WebKit/Tools/DumpRenderTree":
-    Var("webkit_trunk") + "/Tools/DumpRenderTree@" + Var("webkit_revision"),
-
-  "src/third_party/WebKit/Tools/Scripts":
-    Var("webkit_trunk") + "/Tools/Scripts@" + Var("webkit_revision"),
-
-  "src/third_party/WebKit/Tools/TestWebKitAPI":
-    Var("webkit_trunk") + "/Tools/TestWebKitAPI@" + Var("webkit_revision"),
-
-  "src/third_party/ots":
-    (Var("googlecode_url") % "ots") + "/trunk@87",
-
-  "src/tools/page_cycler/acid3":
-    "/trunk/deps/page_cycler/acid3@102714",
-
-  "src/chrome/test/data/perf/canvas_bench":
-    "/trunk/deps/canvas_bench@122605",
-
-  "src/chrome/test/data/perf/frame_rate/content":
-    "/trunk/deps/frame_rate/content@93671",
-
-  "src/third_party/bidichecker":
-    (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4",
-
-  "src/third_party/v8-i18n":
-    (Var("googlecode_url") % "v8-i18n") + "/trunk@104",
-
-  # 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@138171",
-
-  # We should use the same software_rendering_list.json for all branches.
-  "src/chrome/browser/resources/software_rendering_list":
-    "/trunk/deps/gpu/software_rendering_list@141323",
-
-  # We run these layout tests as UI tests. Since many of the buildbots that
-  # run layout tests do NOT have access to the LayoutTest directory, we need
-  # to map them here. In practice, these do not take up much space.
-  "src/content/test/data/layout_tests/LayoutTests/fast/events":
-    Var("webkit_trunk") + "/LayoutTests/fast/events@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/fast/js/resources":
-    Var("webkit_trunk") + "/LayoutTests/fast/js/resources@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/fast/workers":
-    Var("webkit_trunk") + "/LayoutTests/fast/workers@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/http/tests/resources":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/resources@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/http/tests/workers":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/workers@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/xmlhttprequest@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/websocket/tests@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium/fast/workers@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium/fast/events@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/fast/events@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/fast/workers@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/http/tests/appcache":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/appcache@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/http/tests/workers@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/storage/domstorage@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/storage/domstorage":
-    Var("webkit_trunk") + "/LayoutTests/storage/domstorage@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/storage/indexeddb":
-    Var("webkit_trunk") + "/LayoutTests/storage/indexeddb@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/fast/filesystem/resources":
-    Var("webkit_trunk") + "/LayoutTests/fast/filesystem/resources@" +
-    Var("webkit_revision"),
-  "src/content/test/data/layout_tests/LayoutTests/media":
-    Var("webkit_trunk") + "/LayoutTests/media@" +
-    Var("webkit_revision"),
-
-  "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@16922",
-
-  "src/third_party/libvpx":
-    "/trunk/deps/third_party/libvpx@" +
-    Var("libvpx_revision"),
-
-  "src/third_party/ffmpeg":
-    "/trunk/deps/third_party/ffmpeg@" +
-    Var("ffmpeg_revision"),
-
-  "src/third_party/libjingle/source":
-    (Var("googlecode_url") % "libjingle") + "/trunk@" +
-    Var("libjingle_revision"),
-
-  "src/third_party/libsrtp":
-    "/trunk/deps/third_party/libsrtp@123853",
-
-  "src/third_party/speex":
-    "/trunk/deps/third_party/speex@111570",
-
-  "src/third_party/yasm/source/patched-yasm":
-    "/trunk/deps/third_party/yasm/patched-yasm@134927",
-
-  "src/third_party/libjpeg_turbo":
-    "/trunk/deps/third_party/libjpeg_turbo@139754",
-
-  "src/third_party/flac":
-    "/trunk/deps/third_party/flac@120197",
-
-  "src/third_party/pyftpdlib/src":
-    (Var("googlecode_url") % "pyftpdlib") + "/trunk@977",
-
-  # Needed to support nacl browser test jig.
-  "src/third_party/pylib":
-    Var("nacl_trunk") + "/src/third_party/pylib@" + Var("nacl_tools_revision"),
-  "src/third_party/scons-2.0.1":
-    Var("nacl_trunk") + "/src/third_party/scons-2.0.1@" +
-        Var("nacl_tools_revision"),
-
-  "src/third_party/webrtc":
-    (Var("googlecode_url") % "webrtc") + "/stable/src@" + Var("webrtc_revision"),
-
-  "src/third_party/jsoncpp/source/include":
-    (Var("sourceforge_url") % {"repo": "jsoncpp"}) +
-        "/trunk/jsoncpp/include@" + Var("jsoncpp_revision"),
-
-  "src/third_party/jsoncpp/source/src/lib_json":
-    (Var("sourceforge_url") % {"repo": "jsoncpp"}) +
-        "/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"),
-
-  "src/third_party/libyuv":
-    (Var("googlecode_url") % "libyuv") + "/trunk@247",
-
-  "src/third_party/mozc/session":
-    (Var("googlecode_url") % "mozc") + "/trunk/src/session@83",
-
-  "src/third_party/mozc/chrome/chromeos/renderer":
-    (Var("googlecode_url") % "mozc") + "/trunk/src/chrome/chromeos/renderer@83",
-
-  "src/third_party/smhasher/src":
-    (Var("googlecode_url") % "smhasher") + "/trunk@136",
-
-  "src/third_party/libphonenumber/src/phonenumbers":
-     (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"),
-  "src/third_party/libphonenumber/src/resources":
-     (Var("googlecode_url") % "libphonenumber") + "/trunk/resources@" +
-         Var("libphonenumber_revision"),
-
-  "src/third_party/undoview":
-    "/trunk/deps/third_party/undoview@119694",
-
-  "src/tools/deps2git":
-    "/trunk/tools/deps2git@139377",
-
-  "src/third_party/webpagereplay":
-    (Var("googlecode_url") % "web-page-replay") + "/trunk@476",
+   'src/third_party/mozc/chrome/chromeos/renderer':
+      'http://mozc.googlecode.com/svn/trunk/src/chrome/chromeos/renderer@83',
+   'src/content/test/data/layout_tests/LayoutTests/fast/filesystem/resources':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/fast/filesystem/resources@126646',
+   'src/third_party/skia/include':
+      'http://skia.googlecode.com/svn/branches/chrome/m21_1180/include@4285',
+   'build/scripts/private/data/reliability':
+      '/trunk/src/chrome/test/data/reliability@109518',
+   'src/third_party/flac':
+      '/trunk/deps/third_party/flac@120197',
+   'chromeos':
+      '/trunk/src/tools/cros.DEPS@141890',
+   'src/chrome/test/data/perf/frame_rate/content':
+      '/trunk/deps/frame_rate/content@93671',
+   'src/third_party/ots':
+      'http://ots.googlecode.com/svn/trunk@87',
+   'src/third_party/sfntly/cpp/src':
+      'http://sfntly.googlecode.com/svn/trunk/cpp/src@128',
+   'src/third_party/undoview':
+      '/trunk/deps/third_party/undoview@119694',
+   'src/googleurl':
+      'http://google-url.googlecode.com/svn/trunk@175',
+   'build/third_party/lighttpd':
+      '/trunk/deps/third_party/lighttpd@58968',
+   'src/third_party/webgl_conformance':
+      '/trunk/deps/third_party/webgl/sdk/tests@138171',
+   'src/third_party/hunspell_dictionaries':
+      '/trunk/deps/third_party/hunspell_dictionaries@138928',
+   'src/content/test/data/layout_tests/LayoutTests/storage/indexeddb':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/storage/indexeddb@126646',
+   'src/content/test/data/layout_tests/LayoutTests/media':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/media@126646',
+   'src/content/test/data/layout_tests/LayoutTests/http/tests/appcache':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/http/tests/appcache@126646',
+   'commit-queue':
+      '/trunk/tools/commit-queue@142779',
+   'src/third_party/scons-2.0.1':
+      'http://src.chromium.org/native_client/trunk/src/third_party/scons-2.0.1@8673',
+   'src/third_party/webdriver/pylib':
+      'http://selenium.googlecode.com/svn/trunk/py@16922',
+   'build/scripts/gsd_generate_index':
+      '/trunk/tools/gsd_generate_index@110568',
+   'src':
+      '/branches/1180/src@153370',
+   'src/third_party/libyuv':
+      'http://libyuv.googlecode.com/svn/trunk@247',
+   'src/chrome/browser/resources/software_rendering_list':
+      '/trunk/deps/gpu/software_rendering_list@145802',
+   'src/third_party/hunspell':
+      '/trunk/deps/third_party/hunspell@132738',
+   'src/third_party/libphonenumber/src/phonenumbers':
+      'http://libphonenumber.googlecode.com/svn/trunk/cpp/src/phonenumbers@456',
+   'src/third_party/libphonenumber/src/resources':
+      'http://libphonenumber.googlecode.com/svn/trunk/resources@456',
+   'src/third_party/safe_browsing/testing':
+      'http://google-safe-browsing.googlecode.com/svn/trunk/testing@110',
+   'src/content/test/data/layout_tests/LayoutTests/http/tests/workers':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/http/tests/workers@126646',
+   'src/content/test/data/layout_tests/LayoutTests/fast/workers':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/fast/workers@126646',
+   'build/third_party/gsutil':
+      'http://gsutil.googlecode.com/svn/trunk/src@145',
+   'src/third_party/pyftpdlib/src':
+      'http://pyftpdlib.googlecode.com/svn/trunk@977',
+   'src/content/test/data/layout_tests/LayoutTests/storage/domstorage':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/storage/domstorage@126646',
+   'src/third_party/snappy/src':
+      'http://snappy.googlecode.com/svn/trunk@37',
+   'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/platform/chromium/fast/workers@126646',
+   'src/tools/deps2git':
+      '/trunk/tools/deps2git@139377',
+   'src/third_party/libjpeg_turbo':
+      '/trunk/deps/third_party/libjpeg_turbo@139754',
+   'src/third_party/v8-i18n':
+      'http://v8-i18n.googlecode.com/svn/trunk@105',
+   'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/platform/chromium/fast/events@126646',
+   'depot_tools':
+      '/trunk/tools/depot_tools@142479',
+   'src/third_party/bidichecker':
+      'http://bidichecker.googlecode.com/svn/trunk/lib@4',
+   'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/platform/chromium-win/http/tests/workers@126646',
+   'src/breakpad/src':
+      'http://google-breakpad.googlecode.com/svn/trunk/src@970',
+   'src/third_party/pylib':
+      'http://src.chromium.org/native_client/trunk/src/third_party/pylib@8673',
+   'src/content/test/data/layout_tests/LayoutTests/http/tests/resources':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/http/tests/resources@126646',
+   'src/third_party/jsoncpp/source/src/lib_json':
+      'http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/src/lib_json@248',
+   'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/platform/chromium-win/fast/workers@126646',
+   'build/scripts/command_wrapper/bin':
+      '/trunk/tools/command_wrapper/bin@135178',
+   'src/testing/gtest':
+      'http://googletest.googlecode.com/svn/trunk@613',
+   'src/third_party/WebKit/Source':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/Source@126646',
+   'src/testing/gmock':
+      'http://googlemock.googlecode.com/svn/trunk@405',
+   'src/third_party/skia/src':
+      'http://skia.googlecode.com/svn/branches/chrome/m21_1180/src@4285',
+   'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
+      'http://src.chromium.org/native_client/trunk/src/native_client/tests/prebuilt@8950',
+   'src/third_party/smhasher/src':
+      'http://smhasher.googlecode.com/svn/trunk@136',
+   'src/third_party/webrtc':
+      'http://webrtc.googlecode.com/svn/branches/3.7/src@2407',
+   'src/native_client':
+      'http://src.chromium.org/native_client/trunk/src/native_client@8950',
+   'src/tools/page_cycler/acid3':
+      '/trunk/deps/page_cycler/acid3@102714',
+   'src/third_party/leveldatabase/src':
+      'http://leveldb.googlecode.com/svn/trunk@64',
+   'src/third_party/mozc/session':
+      'http://mozc.googlecode.com/svn/trunk/src/session@83',
+   'build':
+      '/trunk/tools/build@142797',
+   'src/tools/gyp':
+      'http://gyp.googlecode.com/svn/trunk@1416',
+   'src/chrome/test/data/perf/canvas_bench':
+      '/trunk/deps/canvas_bench@122605',
+   'src/third_party/ffmpeg':
+      '/trunk/deps/third_party/ffmpeg@142289',
+   'src/third_party/cacheinvalidation/files/src/google':
+      'http://google-cache-invalidation-api.googlecode.com/svn/trunk/src/google@218',
+   'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/platform/chromium-win/storage/domstorage@126646',
+   'src/native_client_sdk/src/site_scons':
+      'http://src.chromium.org/native_client/trunk/src/native_client/site_scons@8950',
+   'src/third_party/libexif/sources':
+      '/trunk/deps/third_party/libexif/sources@141967',
+   'src/content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/http/tests/xmlhttprequest@126646',
+   'src/third_party/jsoncpp/source/include':
+      'http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@248',
+   'src/third_party/libphonenumber/src/test':
+      'http://libphonenumber.googlecode.com/svn/trunk/cpp/test@456',
+   'src/third_party/libsrtp':
+      '/trunk/deps/third_party/libsrtp@123853',
+   'src/third_party/WebKit/Tools/Scripts':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/Tools/Scripts@126646',
+   'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/platform/chromium-win/fast/events@126646',
+   'src/third_party/yasm/source/patched-yasm':
+      '/trunk/deps/third_party/yasm/patched-yasm@134927',
+   'src/sdch/open-vcdiff':
+      'http://open-vcdiff.googlecode.com/svn/trunk@42',
+   'src/third_party/pymox/src':
+      'http://pymox.googlecode.com/svn/trunk@70',
+   'src/third_party/libjingle/source':
+      'http://libjingle.googlecode.com/svn/trunk@157',
+   'src/content/test/data/layout_tests/LayoutTests/fast/events':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/fast/events@126646',
+   'src/third_party/WebKit':
+      '/trunk/deps/third_party/WebKit@76115',
+   'src/third_party/icu':
+      '/trunk/deps/third_party/icu46@140144',
+   'src/third_party/speex':
+      '/trunk/deps/third_party/speex@111570',
+   'src/tools/grit':
+      'http://grit-i18n.googlecode.com/svn/trunk@56',
+   'src/third_party/WebKit/Tools/DumpRenderTree':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/Tools/DumpRenderTree@126646',
+   'src/third_party/webpagereplay':
+      'http://web-page-replay.googlecode.com/svn/trunk@476',
+   'src/third_party/trace-viewer':
+      'http://trace-viewer.googlecode.com/svn/trunk@26',
+   'src/seccompsandbox':
+      'http://seccompsandbox.googlecode.com/svn/trunk@186',
+   'src/third_party/WebKit/LayoutTests':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests@126646',
+   'src/third_party/swig/Lib':
+      '/trunk/deps/third_party/swig/Lib@69281',
+   'src/third_party/WebKit/Tools/TestWebKitAPI':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/Tools/TestWebKitAPI@126646',
+   'src/third_party/angle':
+      'http://angleproject.googlecode.com/svn/branches/chrome_m21b@1257',
+   'src/v8':
+      'http://v8.googlecode.com/svn/branches/3.11@12359',
+   'src/third_party/libvpx':
+      '/trunk/deps/third_party/libvpx@134182',
+   'src/content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/http/tests/websocket/tests@126646',
+   'src/content/test/data/layout_tests/LayoutTests/fast/js/resources':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1180/LayoutTests/fast/js/resources@126646',
 }
 
+skip_child_includes =  ['breakpad', 'chrome_frame', 'delegate_execute', 'metro_driver', 'native_client', 'native_client_sdk', 'o3d', 'pdf', 'sdch', 'skia', 'testing', 'third_party', 'v8'] 
 
-deps_os = {
-  "win": {
-    "src/chrome/tools/test/reference_build/chrome_win":
-      "/trunk/deps/reference_builds/chrome_win@137747",
+hooks =  [{'action': ['python', 'src/build/download_nacl_toolchains.py', '--no-arm-trusted', '--optional-pnacl', '--pnacl-version', '8847', '--file-hash', 'pnacl_linux_x86_32', '5b56a39c2bb63f35c731c76fb0a28d9039f18126', '--file-hash', 'pnacl_linux_x86_64', '02fb84aaf805eb33774e85de34adc1906df3c81f', '--file-hash', 'pnacl_translator', '4be9f32463a1687a385b072071c0cd8c36a69aac', '--file-hash', 'pnacl_mac_x86_32', '28fdc9843cc2c920ba5a252c8884037903daa19c', '--file-hash', 'pnacl_win_x86_32', '9f276642818cb92a2ffb63988d346376b66d3b7b', '--x86-version', '8715', '--file-hash', 'mac_x86_newlib', '4f072a30b55ce9088ed6c6a0033dffa3a8ae301b', '--file-hash', 'win_x86_newlib', 'cd4f8209a6f87d8baf21d1610928a3def4306764', '--file-hash', 'linux_x86_newlib', '849a8cf371e17a685b9429a69474f328454b5e06', '--file-hash', 'mac_x86', '42575a21646027d52778240c03246d4534c98956', '--file-hash', 'win_x86', '85d9b16cb503a10963654803c4a4f90ea6edfff2', '--file-hash', 'linux_x86', 'd82ef6eea6ff6ba427efa70461c2fc411d64569f', '--save-downloads-dir', 'src/native_client_sdk/src/build_tools/toolchain_archives', '--keep'], 'pattern': '.'}, {'action': ['python', 'src/tools/clang/scripts/update.py', '--mac-only'], 'pattern': '.'}, {'action': ['python', 'src/build/win/setup_cygwin_mount.py', '--win-only'], 'pattern': '.'}, {'action': ['python', 'src/build/util/lastchange.py', '-o', 'src/build/util/LASTCHANGE'], 'pattern': '.'}, {'action': ['python', 'src/build/gyp_chromium'], 'pattern': '.'}] 
 
-    "src/third_party/cygwin":
-      "/trunk/deps/third_party/cygwin@133786",
-
-    "src/third_party/python_26":
-      "/trunk/tools/third_party/python_26@89111",
-
-    "src/third_party/psyco_win32":
-      "/trunk/deps/third_party/psyco_win32@79861",
-
-    "src/third_party/lighttpd":
-      "/trunk/deps/third_party/lighttpd@33727",
-
-    # Chrome Frame related deps
-    "src/third_party/xulrunner-sdk":
-      "/trunk/deps/third_party/xulrunner-sdk@119756",
-    "src/chrome_frame/tools/test/reference_build/chrome_win":
-      "/trunk/deps/reference_builds/chrome_win@89574",
-
-    # Parses Windows PE/COFF executable format.
-    "src/third_party/pefile":
-      (Var("googlecode_url") % "pefile") + "/trunk@63",
-
-    # NSS, for SSLClientSocketNSS.
-    "src/third_party/nss":
-      "/trunk/deps/third_party/nss@" + Var("nss_revision"),
-
-    "src/third_party/swig/win":
-      "/trunk/deps/third_party/swig/win@" + Var("swig_revision"),
-
-    # GNU binutils assembler for x86-32.
-    "src/third_party/gnu_binutils":
-      (Var("nacl_trunk") + "/deps/third_party/gnu_binutils@" +
-       Var("nacl_tools_revision")),
-    # GNU binutils assembler for x86-64.
-    "src/third_party/mingw-w64/mingw/bin":
-      (Var("nacl_trunk") + "/deps/third_party/mingw-w64/mingw/bin@" +
-       Var("nacl_tools_revision")),
-
-    "src/rlz":
-      (Var("googlecode_url") % "rlz") + "/trunk@" + Var("rlz_revision"),
-
-    # Dependencies used by libjpeg-turbo
-    "src/third_party/yasm/binaries":
-      "/trunk/deps/third_party/yasm/binaries@74228",
-
-    # 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@782",
-
-    # Binaries for nacl sdk.
-    "src/third_party/nacl_sdk_binaries":
-      "/trunk/deps/third_party/nacl_sdk_binaries@111576",
-  },
-  "mac": {
-    "src/chrome/tools/test/reference_build/chrome_mac":
-      "/trunk/deps/reference_builds/chrome_mac@137727",
-
-    "src/third_party/GTM":
-      (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@516",
-    "src/third_party/pdfsqueeze":
-      (Var("googlecode_url") % "pdfsqueeze") + "/trunk@4",
-    "src/third_party/lighttpd":
-      "/trunk/deps/third_party/lighttpd@33737",
-
-    "src/third_party/swig/mac":
-      "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"),
-
-    "src/rlz":
-      (Var("googlecode_url") % "rlz") + "/trunk@" + Var("rlz_revision"),
-
-    # NSS, for SSLClientSocketNSS.
-    "src/third_party/nss":
-      "/trunk/deps/third_party/nss@" + Var("nss_revision"),
-
-    "src/chrome/installer/mac/third_party/xz/xz":
-      "/trunk/deps/third_party/xz@87706",
-  },
-  "unix": {
-    # Linux, really.
-    "src/chrome/tools/test/reference_build/chrome_linux":
-      "/trunk/deps/reference_builds/chrome_linux@137712",
-
-    "src/third_party/xdg-utils":
-      "/trunk/deps/third_party/xdg-utils@93299",
-
-    "src/third_party/swig/linux":
-      "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"),
-
-    "src/third_party/lss":
-      ((Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@" +
-       Var("lss_revision")),
-
-    "src/third_party/openssl":
-      "/trunk/deps/third_party/openssl@130472",
-
-    "src/third_party/WebKit/Tools/gdb":
-      Var("webkit_trunk") + "/Tools/gdb@" + Var("webkit_revision"),
-
-    "src/third_party/gold":
-      "/trunk/deps/third_party/gold@124239",
-  },
-  "android": {
-    "src/third_party/freetype":
-      Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
-      "@1f74e4e7ad3ca4163b4578fc30da26a165dd55e7",
-
-    "src/third_party/aosp":
-      "/trunk/deps/third_party/aosp@122156",
-  },
-}
-
-
-include_rules = [
-  # Everybody can use some things.
-  "+base",
-  "+build",
-  "+googleurl",
-  "+ipc",
-
-  # For now, we allow ICU to be included by specifying "unicode/...", although
-  # this should probably change.
-  "+unicode",
-  "+testing",
-]
-
-
-# checkdeps.py shouldn't check include paths for files in these dirs:
-skip_child_includes = [
-  "breakpad",
-  "chrome_frame",
-  "delegate_execute",
-  "metro_driver",
-  "native_client",
-  "native_client_sdk",
-  "o3d",
-  "pdf",
-  "sdch",
-  "skia",
-  "testing",
-  "third_party",
-  "v8",
-]
-
-
-hooks = [
-  {
-    # This downloads binaries for Native Client's newlib toolchain.
-    # Done in lieu of building the toolchain from scratch as it can take
-    # anywhere from 30 minutes to 4 hours depending on platform to build.
-    "pattern": ".",
-    "action": [
-        "python", "src/build/download_nacl_toolchains.py",
-         "--no-arm-trusted",
-         "--optional-pnacl",
-         "--pnacl-version", Var("pnacl_toolchain_revision"),
-         "--file-hash", "pnacl_linux_x86_32",
-             Var("nacl_toolchain_pnacl_linux_x86_32_hash"),
-         "--file-hash", "pnacl_linux_x86_64",
-             Var("nacl_toolchain_pnacl_linux_x86_64_hash"),
-         "--file-hash", "pnacl_translator",
-             Var("nacl_toolchain_pnacl_translator_hash"),
-         "--file-hash", "pnacl_mac_x86_32",
-             Var("nacl_toolchain_pnacl_mac_x86_32_hash"),
-         "--file-hash", "pnacl_win_x86_32",
-             Var("nacl_toolchain_pnacl_win_x86_32_hash"),
-         "--x86-version", Var("nacl_toolchain_revision"),
-         "--file-hash", "mac_x86_newlib",
-             Var("nacl_toolchain_mac_x86_newlib_hash"),
-         "--file-hash", "win_x86_newlib",
-             Var("nacl_toolchain_win_x86_newlib_hash"),
-         "--file-hash", "linux_x86_newlib",
-             Var("nacl_toolchain_linux_x86_newlib_hash"),
-         "--file-hash", "mac_x86",
-             Var("nacl_toolchain_mac_x86_hash"),
-         "--file-hash", "win_x86",
-             Var("nacl_toolchain_win_x86_hash"),
-         "--file-hash", "linux_x86",
-             Var("nacl_toolchain_linux_x86_hash"),
-         "--save-downloads-dir",
-             "src/native_client_sdk/src/build_tools/toolchain_archives",
-         "--keep",
-    ],
-  },
-  {
-    # 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.
-    "pattern": ".",
-    "action": ["python", "src/build/win/setup_cygwin_mount.py", "--win-only"],
-  },
-  {
-    # Update LASTCHANGE. This is also run by export_tarball.py in
-    # src/tools/export_tarball - please keep them in sync.
-    "pattern": ".",
-    "action": ["python", "src/build/util/lastchange.py",
-               "-o", "src/build/util/LASTCHANGE"],
-  },
-  {
-    # A change to a .gyp, .gypi, or to GYP itself should run the generator.
-    "pattern": ".",
-    "action": ["python", "src/build/gyp_chromium"],
-  },
-]
+include_rules =  ['+base', '+build', '+googleurl', '+ipc', '+unicode', '+testing']
\ No newline at end of file