diff --git a/.DEPS.git b/.DEPS.git
index 97cf76d..11be9bb 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,15 +1,38 @@
-# DO NOT EDIT. THIS IS A GENERATED FILE.
+# 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/UsingGit
+# FOR HOW TO ROLL DEPS
 vars = {
     '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':
-         '@a39d1c402f186146a9e4e174ee22f7cc0c19efa6'
+         '@a39d1c402f186146a9e4e174ee22f7cc0c19efa6',
+    'angle_revision':
+         '99526f0df52b513f9a18180ae18a67847ade8516'
 }
 
 deps = {
+    'build':
+        Var('git_url') + '/chromium/tools/build.git@0571e82f276d294ff34a238e447760f04206f5d0',
+    'build/scripts/command_wrapper/bin':
+        Var('git_url') + '/chromium/tools/command_wrapper/bin.git@fb746e39c73b30a8e12b0857495e3ff0832cd4b2',
+    '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@1b6146b8dbfed02edff75a29fddc501e2af448e1',
+    'depot_tools':
+        Var('git_url') + '/chromium/tools/depot_tools.git@94c712fa1b22489ddf80cd686a00eb2a85920890',
+    'src':
+        Var('git_url') + '/chromium/src.git@74b155e85dccbb411b535f9147af91843bba15e4',
     'src/breakpad/src':
         Var('git_url') + '/external/google-breakpad/src.git@8605b61bd2e1da693b7a6650b734d232ac60e85a',
     'src/build/util/support':
@@ -35,9 +58,9 @@
     'src/testing/gtest':
         Var('git_url') + '/external/googletest.git@a2965825b1953c7b8ad292f726eb5c3f2659d5d3',
     '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@99526f0df52b513f9a18180ae18a67847ade8516',
+        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':
@@ -122,7 +145,7 @@
         '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@dde16d147a5b8d0229f8adf8eee6d180fb9f4684',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
         'src/third_party/GTM':
             Var('git_url') + '/external/google-toolbox-for-mac.git@370bfbfa0a7f3177da752965cd63d3b377d742fb',
         'src/third_party/lighttpd':
@@ -137,7 +160,11 @@
     'unix':
     {
         'src/chrome/tools/test/reference_build/chrome_linux':
-            Var('git_url') + '/chromium/reference_builds/chrome_linux.git@30e720f6bfd2be52c37307114b6fca8817a90562',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
+        'src/third_party/cros':
+            'http://git.chromium.org/chromiumos/platform/cros.git@63b0d1fd',
+        'src/third_party/cros_system_api':
+            'http://git.chromium.org/chromiumos/platform/system_api.git@b999aceb',
         'src/third_party/lss':
             Var('git_url') + '/external/linux-syscall-support/lss.git@92bafa4c45f03a440868c5e2f066ef61e6f4c517',
         'src/third_party/openssl':
@@ -150,9 +177,9 @@
     'win':
     {
         'src/chrome/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/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@9e6b5c3990e1c24f19cff445362d0a2d5ee2bd2f',
         'src/third_party/cygwin':
diff --git a/DEPS b/DEPS
index 7ce3caa..23ba76a 100644
--- a/DEPS
+++ b/DEPS
@@ -1,473 +1,263 @@
-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": "101681",
-  "chromium_git": "http://git.chromium.org/git",
-  "swig_revision": "69281",
-  "nacl_revision": "7300",
-  # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
-  # to update other nacl_*_revision's.
-  "nacl_tools_revision": "7139",  # native_client/DEPS: tools_rev
+#  
+#  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 17.0.958.1
+#  
+#  
+#  
+vars =  {'webkit_trunk': 'http://svn.webkit.org/repository/webkit/trunk'} 
 
-  # 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":
-      "6052b7a1fd6829050bbc72b82ffc0f10c7478f0d",
-  "nacl_toolchain_linux_x86_newlib_hash":
-      "5f82c18ce9d0201f9df852bddcb19746ef690290",
-  "nacl_toolchain_mac_x86_hash":
-      "f7b73f3d9073b75bb1ef6b583eaf56f397ca80ed",
-  "nacl_toolchain_mac_x86_newlib_hash":
-      "648b5ae8ae770b41c4a0eef28cff6f67fe8bb386",
-  "nacl_toolchain_win_x86_hash":
-      "8c216e597f6a13809d40f156e414b3209d9a159c",
-  "nacl_toolchain_win_x86_newlib_hash":
-      "a340bc72900f002f88491bf82baf69d35593ed75",  
-  "nacl_toolchain_revision": "7258",
-
-  "libjingle_revision": "95",
-  "libvpx_revision": "109236",
-  "ffmpeg_revision": "112050",
-  "sfntly_revision": "98",
-  "skia_revision": "2765",
-  # 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": "10089",
-  "webrtc_revision": "1027",
-  "jsoncpp_revision": "246",
+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@89574',
+      'src/rlz':
+      'http://rlz.googlecode.com/svn/trunk@49',
+      'src/third_party/ffmpeg/binaries/chromium/win/ia32':
+      '/trunk/deps/third_party/ffmpeg/binaries/win@112050',
+      '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@7139',
+      'src/chrome_frame/tools/test/reference_build/chrome_win':
+      '/trunk/deps/reference_builds/chrome_win@89574',
+      'src/third_party/xulrunner-sdk':
+      '/trunk/deps/third_party/xulrunner-sdk@71609',
+      'src/third_party/cygwin':
+      '/trunk/deps/third_party/cygwin@66844',
+      '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@543',
+      'src/third_party/nss':
+      '/trunk/deps/third_party/nss@112542',
+   },
+   'mac': {
+      'src/third_party/GTM':
+      'http://google-toolbox-for-mac.googlecode.com/svn/trunk@459',
+      'src/third_party/swig/mac':
+      '/trunk/deps/third_party/swig/mac@69281',
+      '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/lighttpd':
+      '/trunk/deps/third_party/lighttpd@33737',
+      'src/chrome/tools/test/reference_build/chrome_mac':
+      '/trunk/deps/reference_builds/chrome_mac@89574',
+      'src/third_party/nss':
+      '/trunk/deps/third_party/nss@112542',
+   },
+   'unix': {
+      'src/third_party/cros_system_api':
+      'http://git.chromium.org/chromiumos/platform/system_api.git@b999aceb',
+      'src/third_party/openssl':
+      '/trunk/deps/third_party/openssl@105093',
+      'src/third_party/WebKit/Tools/gdb':
+      Var("webkit_trunk")[:-6] + '/trunk/Tools/gdb@101681',
+      'src/chrome/tools/test/reference_build/chrome_linux':
+      '/trunk/deps/reference_builds/chrome_linux@89574',
+      'src/third_party/swig/linux':
+      '/trunk/deps/third_party/swig/linux@69281',
+      'src/third_party/cros':
+      'http://git.chromium.org/chromiumos/platform/cros.git@63b0d1fd',
+      'src/third_party/xdg-utils':
+      '/trunk/deps/third_party/xdg-utils@93299',
+      'src/third_party/lss':
+      'http://linux-syscall-support.googlecode.com/svn/trunk/lss@8',
+   },
 }
 
 deps = {
-  "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@891",
-
-  "src/build/util/support":
-    "/trunk/deps/support@20411",
-
-  "src/googleurl":
-    (Var("googlecode_url") % "google-url") + "/trunk@162",
-
-  "src/seccompsandbox":
-    (Var("googlecode_url") % "seccompsandbox") + "/trunk@178",
-
-  "src/sdch/open-vcdiff":
-    (Var("googlecode_url") % "open-vcdiff") + "/trunk@40",
-
-  "src/testing/gtest":
-    (Var("googlecode_url") % "googletest") + "/trunk@560",
-
-  "src/testing/gmock":
-    (Var("googlecode_url") % "googlemock") + "/trunk@374",
-
-  "src/third_party/angle":
-    (Var("googlecode_url") % "angleproject") + "/trunk@889",
-
-  # 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@107982",
-
-  "src/third_party/hunspell":
-   "/trunk/deps/third_party/hunspell@110423",
-
-  "src/third_party/hunspell_dictionaries":
-    "/trunk/deps/third_party/hunspell_dictionaries@79099",
-
-  "src/third_party/safe_browsing/testing":
-    (Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@106",
-
-  "src/third_party/cacheinvalidation/files/src/google":
-    (Var("googlecode_url") % "google-cache-invalidation-api") +
-    "/trunk/src/google@143",
-
-  "src/third_party/leveldatabase/src":
-    (Var("googlecode_url") % "leveldb") + "/trunk@55",
-
-  "src/third_party/snappy/src":
-    (Var("googlecode_url") % "snappy") + "/trunk@37",
-
-  "src/tools/grit":
-    (Var("googlecode_url") % "grit-i18n") + "/trunk@8",
-
-  "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1101",
-
-  "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/src/sfntly":
-    (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" +
-    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/skia/third_party/glu":
-    (Var("googlecode_url") % "skia") + "/trunk/third_party/glu@" + 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@74",
-
-  "src/tools/page_cycler/acid3":
-    "/trunk/deps/page_cycler/acid3@102714",
-
-  "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@7",
-
-  # 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@106432",
-
-  # 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@110790",
-
-  # 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/chrome/test/data/layout_tests/LayoutTests/fast/events":
-    Var("webkit_trunk") + "/LayoutTests/fast/events@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/fast/js/resources":
-    Var("webkit_trunk") + "/LayoutTests/fast/js/resources@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/fast/workers":
-    Var("webkit_trunk") + "/LayoutTests/fast/workers@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/http/tests/resources":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/resources@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/http/tests/workers":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/workers@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/xmlhttprequest@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/http/tests/websocket/tests":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/websocket/tests@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium/fast/workers@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/fast/events":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-cg-mac/fast/events@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/http/tests/workers":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-cg-mac/http/tests/workers@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/storage/domstorage":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-cg-mac/storage/domstorage@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/fast/events@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/fast/workers@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/http/tests/appcache":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/appcache@" +
-    Var("webkit_revision"),
-  "src/chrome/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/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage":
-    Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/storage/domstorage@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/storage/domstorage":
-    Var("webkit_trunk") + "/LayoutTests/storage/domstorage@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/media":
-    Var("webkit_trunk") + "/LayoutTests/media@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/workers":
-    Var("webkit_trunk") + "/LayoutTests/fast/filesystem/workers@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/resources":
-    Var("webkit_trunk") + "/LayoutTests/fast/filesystem/resources@" +
-    Var("webkit_revision"),
-  "src/chrome/test/data/layout_tests/LayoutTests/http/tests/filesystem":
-    Var("webkit_trunk") + "/LayoutTests/http/tests/filesystem@" +
-    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":
-    "http://selenium.googlecode.com/svn/trunk/py@13487",
-
-  "src/third_party/libvpx":
-    "/trunk/deps/third_party/libvpx@" +
-    Var("libvpx_revision"),
-
-  "src/third_party/ffmpeg":
-    "/trunk/deps/third_party/ffmpeg/source@" +
-    Var("ffmpeg_revision"),
-
-  "src/third_party/libjingle/source":
-    (Var("googlecode_url") % "libjingle") + "/trunk@" +
-    Var("libjingle_revision"),
-
-  "src/third_party/speex":
-    "/trunk/deps/third_party/speex@111570",
-
-  "src/third_party/yasm/source/patched-yasm":
-    "/trunk/deps/third_party/yasm/patched-yasm@73761",
-
-  "src/third_party/libjpeg_turbo":
-    "/trunk/deps/third_party/libjpeg_turbo@111873",
-
-  "src/third_party/flac":
-    "/trunk/deps/third_party/flac@96404",
-
-  "src/third_party/pyftpdlib/src":
-    (Var("googlecode_url") % "pyftpdlib") + "/trunk@888",
-
-  # 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") + "/trunk/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@64",
-
-  "src/third_party/mozc/session":
-    (Var("googlecode_url") % "mozc") + "/trunk/src/session@58",
-
-  "src/third_party/smhasher/src":
-    (Var("googlecode_url") % "smhasher") + "/trunk@136",
+   'src/third_party/skia/include':
+      'http://skia.googlecode.com/svn/trunk/include@2765',
+   'build/scripts/private/data/reliability':
+      '/trunk/src/chrome/test/data/reliability@109518',
+   'src/third_party/flac':
+      '/trunk/deps/third_party/flac@96404',
+   'src/chrome/test/data/layout_tests/LayoutTests/fast/workers':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/fast/workers@101681',
+   'src/chrome/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/http/tests/xmlhttprequest@101681',
+   'src/third_party/sfntly/src/sfntly':
+      'http://sfntly.googlecode.com/svn/trunk/cpp/src/sfntly@98',
+   'build/third_party/lighttpd':
+      '/trunk/deps/third_party/lighttpd@58968',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/storage/domstorage':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium-cg-mac/storage/domstorage@101681',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium/fast/workers@101681',
+   'src/chrome/test/data/layout_tests/LayoutTests/fast/js/resources':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/fast/js/resources@101681',
+   'src/chrome/test/data/layout_tests/LayoutTests/http/tests/resources':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/http/tests/resources@101681',
+   'src/third_party/libyuv':
+      'http://libyuv.googlecode.com/svn/trunk@64',
+   'src/chrome/test/data/layout_tests/LayoutTests/storage/domstorage':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/storage/domstorage@101681',
+   'src/third_party/safe_browsing/testing':
+      'http://google-safe-browsing.googlecode.com/svn/trunk/testing@106',
+   'src/third_party/pyftpdlib/src':
+      'http://pyftpdlib.googlecode.com/svn/trunk@888',
+   'src/third_party/WebKit':
+      '/trunk/deps/third_party/WebKit@76115',
+   'chromeos':
+      '/trunk/src/tools/cros.DEPS@111330',
+   'depot_tools':
+      '/trunk/tools/depot_tools@112465',
+   'src/chrome/test/data/layout_tests/LayoutTests/fast/events':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/fast/events@101681',
+   'src/third_party/bidichecker':
+      'http://bidichecker.googlecode.com/svn/trunk/lib@4',
+   'src/third_party/ots':
+      'http://ots.googlecode.com/svn/trunk@74',
+   'src/third_party/WebKit/Source':
+      Var("webkit_trunk")[:-6] + '/trunk/Source@101681',
+   'src/third_party/jsoncpp/source/src/lib_json':
+      'http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/src/lib_json@246',
+   'src/chrome/test/data/layout_tests/LayoutTests/http/tests/workers':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/http/tests/workers@101681',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium-win/fast/workers@101681',
+   'src/testing/gmock':
+      'http://googlemock.googlecode.com/svn/trunk@374',
+   'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
+      'http://src.chromium.org/native_client/trunk/src/native_client/tests/prebuilt@7300',
+   'src/third_party/smhasher/src':
+      'http://smhasher.googlecode.com/svn/trunk@136',
+   'src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/workers':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/fast/filesystem/workers@101681',
+   'src/third_party/leveldatabase/src':
+      'http://leveldb.googlecode.com/svn/trunk@55',
+   'src/third_party/mozc/session':
+      'http://mozc.googlecode.com/svn/trunk/src/session@58',
+   'src/tools/gyp':
+      'http://gyp.googlecode.com/svn/trunk@1101',
+   'src/sdch/open-vcdiff':
+      'http://open-vcdiff.googlecode.com/svn/trunk@40',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium-win/storage/domstorage@101681',
+   'src/tools/page_cycler/acid3':
+      '/trunk/deps/page_cycler/acid3@102714',
+   'src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/resources':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/fast/filesystem/resources@101681',
+   'src/third_party/jsoncpp/source/include':
+      'http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@246',
+   'src/build/util/support':
+      '/trunk/deps/support@20411',
+   'src/third_party/libjingle/source':
+      'http://libjingle.googlecode.com/svn/trunk@95',
+   'src':
+      '/branches/958/src@112797',
+   'src/chrome/browser/resources/software_rendering_list':
+      '/trunk/deps/gpu/software_rendering_list@110790',
+   'src/third_party/hunspell':
+      '/trunk/deps/third_party/hunspell@110423',
+   'src/chrome/test/data/layout_tests/LayoutTests/http/tests/appcache':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/http/tests/appcache@101681',
+   'src/testing/gtest':
+      'http://googletest.googlecode.com/svn/trunk@560',
+   'src/v8':
+      'http://v8.googlecode.com/svn/trunk@10089',
+   'src/third_party/libvpx':
+      '/trunk/deps/third_party/libvpx@109236',
+   'src/third_party/skia/third_party/glu':
+      'http://skia.googlecode.com/svn/trunk/third_party/glu@2765',
+   'src/breakpad/src':
+      'http://google-breakpad.googlecode.com/svn/trunk/src@891',
+   'src/third_party/v8-i18n':
+      'http://v8-i18n.googlecode.com/svn/trunk@7',
+   'src/chrome/test/data/perf/frame_rate/content':
+      '/trunk/deps/frame_rate/content@93671',
+   'src/googleurl':
+      'http://google-url.googlecode.com/svn/trunk@162',
+   'src/third_party/webgl_conformance':
+      '/trunk/deps/third_party/webgl/sdk/tests@106432',
+   'src/third_party/hunspell_dictionaries':
+      '/trunk/deps/third_party/hunspell_dictionaries@79099',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium-win/fast/events@101681',
+   'src/third_party/scons-2.0.1':
+      'http://src.chromium.org/native_client/trunk/src/third_party/scons-2.0.1@7139',
+   'build/scripts/gsd_generate_index':
+      '/trunk/tools/gsd_generate_index@110568',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/fast/events':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium-cg-mac/fast/events@101681',
+   'src/third_party/WebKit/Tools/DumpRenderTree':
+      Var("webkit_trunk")[:-6] + '/trunk/Tools/DumpRenderTree@101681',
+   'src/third_party/speex':
+      '/trunk/deps/third_party/speex@111570',
+   'src/third_party/pylib':
+      'http://src.chromium.org/native_client/trunk/src/third_party/pylib@7139',
+   'build/third_party/gsutil':
+      'http://gsutil.googlecode.com/svn/trunk/src@145',
+   'src/third_party/WebKit/LayoutTests':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests@101681',
+   'src/third_party/snappy/src':
+      'http://snappy.googlecode.com/svn/trunk@37',
+   'src/chrome/test/data/layout_tests/LayoutTests/http/tests/websocket/tests':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/http/tests/websocket/tests@101681',
+   'src/third_party/webrtc':
+      'http://webrtc.googlecode.com/svn/trunk/src@1027',
+   'src/chrome/test/data/layout_tests/LayoutTests/media':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/media@101681',
+   'src/third_party/libjpeg_turbo':
+      '/trunk/deps/third_party/libjpeg_turbo@111873',
+   'src/third_party/webdriver/pylib':
+      'http://selenium.googlecode.com/svn/trunk/py@13487',
+   'src/third_party/skia/src':
+      'http://skia.googlecode.com/svn/trunk/src@2765',
+   'build':
+      '/trunk/tools/build@112589',
+   'src/third_party/ffmpeg':
+      '/trunk/deps/third_party/ffmpeg/source@112050',
+   'src/third_party/cacheinvalidation/files/src/google':
+      'http://google-cache-invalidation-api.googlecode.com/svn/trunk/src/google@143',
+   'src/native_client':
+      'http://src.chromium.org/native_client/trunk/src/native_client@7300',
+   'src/native_client_sdk/src/site_scons':
+      'http://src.chromium.org/native_client/trunk/src/native_client/site_scons@7300',
+   'src/third_party/WebKit/Tools/Scripts':
+      Var("webkit_trunk")[:-6] + '/trunk/Tools/Scripts@101681',
+   'src/third_party/pymox/src':
+      'http://pymox.googlecode.com/svn/trunk@70',
+   'src/chrome/test/data/layout_tests/LayoutTests/http/tests/filesystem':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/http/tests/filesystem@101681',
+   'build/scripts/command_wrapper/bin':
+      '/trunk/tools/command_wrapper/bin@111020',
+   'src/third_party/icu':
+      '/trunk/deps/third_party/icu46@107982',
+   'src/tools/grit':
+      'http://grit-i18n.googlecode.com/svn/trunk@8',
+   'src/seccompsandbox':
+      'http://seccompsandbox.googlecode.com/svn/trunk@178',
+   'src/third_party/yasm/source/patched-yasm':
+      '/trunk/deps/third_party/yasm/patched-yasm@73761',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/http/tests/workers':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium-cg-mac/http/tests/workers@101681',
+   'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers':
+      Var("webkit_trunk")[:-6] + '/trunk/LayoutTests/platform/chromium-win/http/tests/workers@101681',
+   'src/third_party/WebKit/Tools/TestWebKitAPI':
+      Var("webkit_trunk")[:-6] + '/trunk/Tools/TestWebKitAPI@101681',
+   'src/third_party/angle':
+      'http://angleproject.googlecode.com/svn/trunk@889',
+   'src/third_party/swig/Lib':
+      '/trunk/deps/third_party/swig/Lib@69281',
 }
 
+skip_child_includes =  ['breakpad', 'chrome_frame', '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@89574",
+hooks =  [{'action': ['python', 'src/build/download_nacl_toolchains.py', '--no-pnacl', '--no-arm-trusted', '--x86-version', '7258', '--file-hash', 'mac_x86_newlib', '648b5ae8ae770b41c4a0eef28cff6f67fe8bb386', '--file-hash', 'win_x86_newlib', 'a340bc72900f002f88491bf82baf69d35593ed75', '--file-hash', 'linux_x86_newlib', '5f82c18ce9d0201f9df852bddcb19746ef690290', '--file-hash', 'mac_x86', 'f7b73f3d9073b75bb1ef6b583eaf56f397ca80ed', '--file-hash', 'win_x86', '8c216e597f6a13809d40f156e414b3209d9a159c', '--file-hash', 'linux_x86', '6052b7a1fd6829050bbc72b82ffc0f10c7478f0d', '--save-downloads-dir', 'src/native_client_sdk/src/build_tools/toolchain_archives'], 'pattern': '.'}, {'action': ['python', 'src/tools/clang/scripts/update.py', '--mac-only'], 'pattern': '.'}, {'action': ['python', 'src/build/gyp_chromium'], 'pattern': '.'}] 
 
-    "src/third_party/cygwin":
-      "/trunk/deps/third_party/cygwin@66844",
-
-    "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",
-
-    "src/third_party/ffmpeg/binaries/chromium/win/ia32":
-      "/trunk/deps/third_party/ffmpeg/binaries/win@" + Var("ffmpeg_revision"),
-
-    # Chrome Frame related deps
-    "src/third_party/xulrunner-sdk":
-      "/trunk/deps/third_party/xulrunner-sdk@71609",
-    "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@112542",
-
-    "src/third_party/swig/win":
-      "/trunk/deps/third_party/swig/win@" + Var("swig_revision"),
-
-    "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@49",
-
-    # 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@543",
-
-    # 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@89574",
-
-    "src/third_party/GTM":
-      (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@459",
-    "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"),
-
-    # NSS, for SSLClientSocketNSS.
-    "src/third_party/nss":
-      "/trunk/deps/third_party/nss@112542",
-
-    "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@89574",
-
-    "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@8",
-
-    "src/third_party/openssl":
-      "/trunk/deps/third_party/openssl@105093",
-
-    "src/third_party/WebKit/Tools/gdb":
-      Var("webkit_trunk") + "/Tools/gdb@" + Var("webkit_revision"),
-  },
-}
-
-
-include_rules = [
-  # Everybody can use some things.
-  "+base",
-  "+build",
-  "+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",
-  "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-pnacl",
-         "--no-arm-trusted",
-         "--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",
-    ],
-  },
-  {
-    # 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"],
-  },
-  {
-    # 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', '+ipc', '+unicode', '+testing']
\ No newline at end of file