diff --git a/.DEPS.git b/.DEPS.git
index 8372fa8..9c2b901 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -4,17 +4,35 @@
 # SEE http://code.google.com/p/chromium/wiki/UsingGit
 # FOR HOW TO ROLL DEPS
 vars = {
-    'ffmpeg_hash':
-         '@681ca6bfed239ad2e1a6a3c8a586839c6dbd3e87',
     'webkit_url':
          'https://chromium.googlesource.com/chromium/blink.git',
     'git_url':
          'https://chromium.googlesource.com',
     'webkit_rev':
-         '@5e5012477d12ca62ee311dc8b48b02de782e04ff'
+         '@e1d6286b9966b168f4b68f115b9b4111a278e4ab',
+    'angle_revision':
+         'fa63e947cb3eccf463648d21a05d5002c9b8adfa'
 }
 
 deps = {
+    'build':
+        Var('git_url') + '/chromium/tools/build.git@6808c067e9d22abac254f01d91a6295273a3455d',
+    '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@d2f5d5a5d212d8fb337d751c0351644a6ac83ac8',
+    'build/scripts/private/data/reliability':
+        Var('git_url') + '/chromium/src.git@b0936d257dbc943ee00dd91a86d659ea346b135b',
+    'build/scripts/tools/deps2git':
+        Var('git_url') + '/chromium/tools/deps2git.git@cc7dc6eae98fb970db3b59536df3d27a9d782fc8',
+    'build/third_party/lighttpd':
+        Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+    'commit-queue':
+        Var('git_url') + '/chromium/tools/commit-queue.git@7779c66e03aa5b87a2d7354387b3d16338da9e29',
+    'depot_tools':
+        Var('git_url') + '/chromium/tools/depot_tools.git@99f9c92f73939ce47b3d6f3597c6bb58eda2bc15',
+    'src':
+        Var('git_url') + '/chromium/src.git@72088f299912c12a5c4543caeeb7942d8d2e437e',
     'src/breakpad/src':
         Var('git_url') + '/external/google-breakpad/src.git@d7b5ea03d763b25445c198963034b49596da45f0',
     'src/chrome/browser/resources/pdf/html_office':
@@ -38,13 +56,13 @@
     'src/testing/gtest':
         Var('git_url') + '/external/googletest.git@74de57c951aedebc5dfe26a27604353432392b98',
     'src/third_party/WebKit':
-        Var('webkit_url') + Var('webkit_rev'),
+        Var('webkit_url') + '' + Var('webkit_rev'),
     'src/third_party/WebKit/LayoutTests/w3c/csswg-test':
         Var('git_url') + '/external/w3c/csswg-test.git@8c415e3215a203fa3a22dbdd1799279fdf44c81e',
     'src/third_party/WebKit/LayoutTests/w3c/web-platform-tests':
         Var('git_url') + '/external/w3c/web-platform-tests.git@ac4322a338be82b3d8b722917d6d3d057c0a3f6a',
     'src/third_party/angle':
-        Var('git_url') + '/angle/angle.git@fa63e947cb3eccf463648d21a05d5002c9b8adfa',
+        Var('git_url') + '/angle/angle.git' + '@' + Var('angle_revision'),
     'src/third_party/bidichecker':
         Var('git_url') + '/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0',
     'src/third_party/brotli/src':
@@ -56,7 +74,7 @@
     'src/third_party/cld_2/src':
         Var('git_url') + '/external/cld2.git@b17c3c025db379fbeb56c4215bc1eb8737576f4c',
     'src/third_party/ffmpeg':
-        Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+        Var('git_url') + '/chromium/deps/ffmpeg.git@427e1d5dfbea2b635829b6a66fb6a6308da97719',
     'src/third_party/flac':
         Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
     'src/third_party/hunspell':
@@ -160,6 +178,8 @@
 deps_os = {
     'android':
     {
+        'src/pdf':
+            None,
         'src/third_party/android_tools':
             Var('git_url') + '/android_tools.git@0582bdc17b4829beb522975441546a4eb99b11b5',
         'src/third_party/aosp':
@@ -295,7 +315,7 @@
         'src/chrome/installer/mac/third_party/xz/xz':
             Var('git_url') + '/chromium/deps/xz.git@eecaf55632ca72e90eb2641376bce7cdbc7284f7',
         'src/chrome/tools/test/reference_build/chrome_mac':
-            Var('git_url') + '/chromium/reference_builds/chrome_mac.git@78cf441c4ed0727b7bdadd63818e529898c3e4dd',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
         'src/third_party/google_toolbox_for_mac/src':
             Var('git_url') + '/external/google-toolbox-for-mac.git@704fb56df6a9a0884801045a158e021945d9d991',
         'src/third_party/lighttpd':
@@ -309,8 +329,12 @@
     },
     'unix':
     {
+        'build/third_party/cbuildbot_chromite':
+            Var('git_url') + '/chromiumos/chromite.git@fa2ce68b6d8532803bbe8a6dd18a3a2800b48309',
+        'build/third_party/xvfb':
+            Var('git_url') + '/chromium/tools/third_party/xvfb.git@aebb1aadf1422e4d81e831e13746b8f7ae322e07',
         'src/chrome/tools/test/reference_build/chrome_linux':
-            Var('git_url') + '/chromium/reference_builds/chrome_linux.git@f2a1a3b62a81bbd759955e81cc196ff9fdffb54e',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
         'src/third_party/chromite':
             Var('git_url') + '/chromiumos/chromite.git@1ee2901d33ae698d1f2a1d95e9f3fd5bbd5f13f9',
         'src/third_party/cros_dbus_cplusplus/source':
@@ -345,7 +369,7 @@
     'win':
     {
         'src/chrome/tools/test/reference_build/chrome_win':
-            Var('git_url') + '/chromium/reference_builds/chrome_win.git@126d11ec7462975e6f073214929fca0f3c54756e',
+            Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
         'src/third_party/bison':
             Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
         'src/third_party/cygwin':
diff --git a/DEPS b/DEPS
index d8a409f..861dcb8 100644
--- a/DEPS
+++ b/DEPS
@@ -1,724 +1,500 @@
-# 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.
-
+#  
+#  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 35.0.1885.1
+#  
+#  
+#  
 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://svn.code.sf.net/p/%(repo)s/code",
-  "llvm_url": "http://src.chromium.org/llvm-project",
-  "llvm_git": "https://llvm.googlesource.com",
-  "libcxx_revision": "197314",
-  "libcxxabi_revision": "197063",
-  "webkit_trunk": "http://src.chromium.org/blink/trunk",
-  "nacl_trunk": "http://src.chromium.org/native_client/trunk",
-  "webkit_revision": "168937",
-  "chromium_git": "https://chromium.googlesource.com",
-  "chromiumos_git": "https://chromium.googlesource.com/chromiumos",
-  "skia_git": "https://skia.googlesource.com",
-  "swig_revision": "230490",
-  "nacl_revision": "12835",
-  # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
-  # to update other nacl_*_revision's.
-  "nacl_tools_revision": "12760",  # native_client/DEPS: tools_rev
-  "google_toolbox_for_mac_revision": "662",
-  "libaddressinput_revision": "176",
-  "libphonenumber_revision": "621",
-  "libvpx_revision": "255831",
-  "lss_revision": "24",
+  'pymox':
+    'http://pymox.googlecode.com/svn',
+  'sfntly':
+    'http://sfntly.googlecode.com/svn',
+  'eyes-free':
+    'http://eyes-free.googlecode.com/svn',
+  'rlz':
+    'http://rlz.googlecode.com/svn',
+  'smhasher':
+    'http://smhasher.googlecode.com/svn',
+  'blink':
+    'http://src.chromium.org/blink',
+  'bidichecker':
+    'http://bidichecker.googlecode.com/svn',
+  'native_client':
+    'http://src.chromium.org/native_client',
+  'trace-viewer':
+    'http://trace-viewer.googlecode.com/svn',
+  'skia':
+    'http://skia.googlecode.com/svn',
+  'google-breakpad':
+    'http://google-breakpad.googlecode.com/svn',
+  'sawbuck':
+    'http://sawbuck.googlecode.com/svn',
+  'v8-i18n':
+    'http://v8-i18n.googlecode.com/svn',
+  'mozc':
+    'http://mozc.googlecode.com/svn',
+  'git.chromium.org':
+    'https://chromium.googlesource.com',
+  'webkit_trunk':
+    'http://src.chromium.org/blink/trunk',
+  'selenium':
+    'http://selenium.googlecode.com/svn',
+  'snappy':
+    'http://snappy.googlecode.com/svn',
+  'ppapi':
+    'http://ppapi.googlecode.com/svn',
+  'googlemock':
+    'http://googlemock.googlecode.com/svn',
+  'grit-i18n':
+    'http://grit-i18n.googlecode.com/svn',
+  'pywebsocket':
+    'http://pywebsocket.googlecode.com/svn',
+  'libaddressinput':
+    'http://libaddressinput.googlecode.com/svn',
+  'pyftpdlib':
+    'http://pyftpdlib.googlecode.com/svn',
+  'pdfsqueeze':
+    'http://pdfsqueeze.googlecode.com/svn',
+  'protobuf':
+    'http://protobuf.googlecode.com/svn',
+  'google-url':
+    'http://google-url.googlecode.com/svn',
+  'google-toolbox-for-mac':
+    'http://google-toolbox-for-mac.googlecode.com/svn',
+  'leveldb':
+    'http://leveldb.googlecode.com/svn',
+  'googletest':
+    'http://googletest.googlecode.com/svn',
+  'libyuv':
+    'http://libyuv.googlecode.com/svn',
+  'gyp':
+    'http://gyp.googlecode.com/svn',
+  'v8':
+    'http://v8.googlecode.com/svn',
+  'seccompsandbox':
+    'http://seccompsandbox.googlecode.com/svn',
+  'ots':
+    'http://ots.googlecode.com/svn',
+  'angleproject':
+    'http://angleproject.googlecode.com/svn',
+  'pefile':
+    'http://pefile.googlecode.com/svn',
+  'open-vcdiff':
+    'http://open-vcdiff.googlecode.com/svn',
+  'octane-benchmark':
+    'http://octane-benchmark.googlecode.com/svn',
+  'linux-syscall-support':
+    'http://linux-syscall-support.googlecode.com/svn',
+  'sctp-refimpl':
+    'https://sctp-refimpl.googlecode.com/svn',
+  'jsoncpp':
+    'http://svn.code.sf.net/p/jsoncpp/code',
+  'webrtc':
+    'http://webrtc.googlecode.com/svn',
+  'web-page-replay':
+    'http://web-page-replay.googlecode.com/svn',
+  'libjingle':
+    'http://libjingle.googlecode.com/svn',
+  'libphonenumber':
+    'http://libphonenumber.googlecode.com/svn',
+  'cld2':
+    'https://cld2.googlecode.com/svn',
+  'jsr-305':
+    'http://jsr-305.googlecode.com/svn',
+  'google-cache-invalidation-api':
+    'http://google-cache-invalidation-api.googlecode.com/svn',
+  'google-safe-browsing':
+    'http://google-safe-browsing.googlecode.com/svn',
+}
 
-  # These two FFmpeg variables must be updated together.  One is used for SVN
-  # checkouts and the other for Git checkouts.
-  "ffmpeg_revision": "255431",
-  "ffmpeg_hash": "681ca6bfed239ad2e1a6a3c8a586839c6dbd3e87",
-
-  "sfntly_revision": "228",
-  "lighttpd_revision": "33737",
-  "skia_revision": "13732",
-  "skia_hash": "b5f3b35645ce5335021ecb8c34b486a3db9554eb",
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling Skia
-  # and V8 without interference from each other.
-  "v8_branch": "trunk",
-  "v8_revision": "19696",
-  # 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": "5679",
-  "jsoncpp_revision": "248",
-  "nss_revision": "254867",
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling swarming_client
-  # and whatever else without interference from each other.
-  "swarming_revision": "dd806d645e711260c24bf7a2f061d6db091c3715",
-  # 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": "253925",
-  # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling ANGLE
-  # and whatever else without interference from each other.
-  "angle_revision": "fa63e947cb3eccf463648d21a05d5002c9b8adfa",
+deps_os = {
+   'win': {
+      'src/third_party/yasm/binaries':
+      '/trunk/deps/third_party/yasm/binaries@154708',
+      'src/third_party/nacl_sdk_binaries':
+      '/trunk/deps/third_party/nacl_sdk_binaries@111576',
+      'src/third_party/pefile':
+      Var("pefile") + '/trunk@63',
+      'src/third_party/swig/win':
+      '/trunk/deps/third_party/swig/win@230490',
+      'src/third_party/lighttpd':
+      '/trunk/deps/third_party/lighttpd@33737',
+      'src/chrome/tools/test/reference_build/chrome_win':
+      '/trunk/deps/reference_builds/chrome_win@254637',
+      'src/third_party/bison':
+      '/trunk/deps/third_party/bison@147303',
+      'src/third_party/gnu_binutils':
+      Var("native_client") + '/trunk/deps/third_party/gnu_binutils@12760',
+      'src/third_party/psyco_win32':
+      '/trunk/deps/third_party/psyco_win32@237949',
+      'src/third_party/mingw-w64/mingw/bin':
+      Var("native_client") + '/trunk/deps/third_party/mingw-w64/mingw/bin@12760',
+      'src/third_party/perl':
+      '/trunk/deps/third_party/perl@147900',
+      'src/third_party/gperf':
+      '/trunk/deps/third_party/gperf@147304',
+      'src/third_party/cygwin':
+      '/trunk/deps/third_party/cygwin@231940',
+      'src/third_party/syzygy/binaries':
+      Var("sawbuck") + '/trunk/syzygy/binaries@2058',
+      'src/third_party/nss':
+      '/trunk/deps/third_party/nss@254867',
+   },
+   'mac': {
+      'src/third_party/google_toolbox_for_mac/src':
+      Var("google-toolbox-for-mac") + '/trunk@662',
+      'src/third_party/pdfsqueeze':
+      Var("pdfsqueeze") + '/trunk@5',
+      'src/chrome/installer/mac/third_party/xz/xz':
+      '/trunk/deps/third_party/xz@233311',
+      'src/third_party/swig/mac':
+      '/trunk/deps/third_party/swig/mac@230490',
+      'src/third_party/lighttpd':
+      '/trunk/deps/third_party/lighttpd@33737',
+      'src/chrome/tools/test/reference_build/chrome_mac':
+      '/trunk/deps/reference_builds/chrome_mac@255182',
+      'src/third_party/nss':
+      '/trunk/deps/third_party/nss@254867',
+   },
+   'ios': {
+      'src/third_party/sfntly/cpp/src':
+      None,
+      'src/third_party/libc++/trunk':
+      None,
+      'src/third_party/libc++abi/trunk':
+      None,
+      'src/media/cdm/ppapi/api':
+      None,
+      'src/third_party/v8-i18n':
+      None,
+      'src/chrome/test/data/perf/frame_rate/content':
+      None,
+      'src/third_party/ots':
+      None,
+      'src/third_party/libaddressinput/src/testdata':
+      None,
+      'src/third_party/mesa/src':
+      None,
+      'src/third_party/opus/src':
+      None,
+      'src/third_party/hunspell_dictionaries':
+      None,
+      'src/third_party/brotli/src':
+      None,
+      'src/third_party/webgl':
+      None,
+      'src/chrome/test/data/perf/third_party/octane':
+      None,
+      'src/third_party/scons-2.0.1':
+      None,
+      'src/third_party/webdriver/pylib':
+      None,
+      'src/chrome/test/data/perf/canvas_bench':
+      None,
+      'src/third_party/libexif/sources':
+      None,
+      'src/third_party/safe_browsing/testing':
+      None,
+      'src/third_party/libyuv':
+      None,
+      'src/third_party/libaddressinput/src/cpp':
+      None,
+      'src/third_party/usrsctp/usrsctplib':
+      None,
+      'src/third_party/webrtc':
+      None,
+      'src/third_party/libjpeg_turbo':
+      None,
+      'src/third_party/nss':
+      '/trunk/deps/third_party/nss@254867',
+      'src/third_party/bidichecker':
+      None,
+      'src/third_party/openmax_dl':
+      None,
+      'src/third_party/WebKit/LayoutTests/w3c/csswg-test':
+      None,
+      'src/third_party/google_toolbox_for_mac/src':
+      Var("google-toolbox-for-mac") + '/trunk@662',
+      'src/third_party/WebKit/LayoutTests/w3c/web-platform-tests':
+      None,
+      'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
+      None,
+      'src/third_party/webpagereplay':
+      None,
+      'src/native_client':
+      None,
+      'src/testing/iossim/third_party/class-dump':
+      '/trunk/deps/third_party/class-dump@199203',
+      'src/third_party/cld_2/src':
+      None,
+      'src/third_party/libsrtp':
+      None,
+      'src/third_party/ffmpeg':
+      None,
+      'src/native_client/src/third_party/ppapi':
+      None,
+      'src/tools/page_cycler/acid3':
+      None,
+      'src/build/util/support':
+      None,
+      'src/third_party/pymox/src':
+      None,
+      'src/third_party/yasm/source/patched-yasm':
+      None,
+      'src/third_party/speex':
+      None,
+      'src/third_party/hunspell':
+      None,
+      'src/third_party/angle':
+      None,
+      'src/v8':
+      None,
+      'src/third_party/libvpx':
+      None,
+      'src/third_party/swig/Lib':
+      None,
+   },
+   'unix': {
+      'src/third_party/chromite':
+      Var("git.chromium.org") + '/chromiumos/chromite.git@1ee2901d33ae698d1f2a1d95e9f3fd5bbd5f13f9',
+      'build/third_party/xvfb':
+      '/trunk/tools/third_party/xvfb@125214',
+      'src/third_party/mtpd/source':
+      Var("git.chromium.org") + '/chromiumos/platform/mtpd.git@e4e4656e9aa710f0617dab8746ab6116c0506ceb',
+      'src/third_party/undoview':
+      '/trunk/deps/third_party/undoview@119694',
+      'src/third_party/gold':
+      '/trunk/deps/third_party/gold@228995',
+      'src/third_party/liblouis/src':
+      Var("git.chromium.org") + '/external/liblouis.git@3c2daee56250162e5a75830871601d74328d39f5',
+      'src/third_party/libmtp':
+      '/trunk/deps/third_party/libmtp@206535',
+      'src/third_party/xdg-utils':
+      '/trunk/deps/third_party/xdg-utils@203785',
+      'src/third_party/freetype2/src':
+      Var("git.chromium.org") + '/chromium/src/third_party/freetype2.git@d699c2994ecc178c4ed05ac2086061b2034c2178',
+      'src/third_party/fontconfig/src':
+      Var("git.chromium.org") + '/external/fontconfig.git@f16c3118e25546c1b749f9823c51827a60aeb5c1',
+      'build/third_party/cbuildbot_chromite':
+      Var("git.chromium.org") + '/chromiumos/chromite.git@fa2ce68b6d8532803bbe8a6dd18a3a2800b48309',
+      'src/third_party/cros_system_api':
+      Var("git.chromium.org") + '/chromiumos/platform/system_api.git@185a40a27c15a6187328b00159f2b42047a66572',
+      'src/third_party/pyelftools':
+      Var("git.chromium.org") + '/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e',
+      'src/third_party/openssl':
+      '/trunk/deps/third_party/openssl@253925',
+      'src/third_party/cros_dbus_cplusplus/source':
+      Var("git.chromium.org") + '/chromiumos/third_party/dbus-cplusplus.git@e4120532bbf3ca9f743b0be1f539381a54d16867',
+      'src/chrome/tools/test/reference_build/chrome_linux':
+      '/trunk/deps/reference_builds/chrome_linux@254637',
+      'src/third_party/swig/linux':
+      '/trunk/deps/third_party/swig/linux@230490',
+      'src/third_party/lss':
+      Var("linux-syscall-support") + '/trunk/lss@24',
+   },
+   'android': {
+      'src/third_party/libaddressinput/src/testdata':
+      None,
+      'src/third_party/findbugs':
+      '/trunk/deps/third_party/findbugs@245039',
+      'src/third_party/guava/src':
+      Var("git.chromium.org") + '/external/guava-libraries.git@c523556ab7d0f05afadebd20e7768d4c16af8771',
+      'src/third_party/aosp':
+      '/trunk/deps/third_party/aosp@148330',
+      'src/third_party/jarjar':
+      '/trunk/deps/third_party/jarjar@170888',
+      'src/third_party/android_tools':
+      Var("git.chromium.org") + '/android_tools.git@0582bdc17b4829beb522975441546a4eb99b11b5',
+      'src/third_party/freetype':
+      Var("git.chromium.org") + '/chromium/src/third_party/freetype.git@a2b9955b49034a51dfbc8bf9f4e9d312149cecac',
+      'src/third_party/apache-mime4j':
+      '/trunk/deps/third_party/apache-mime4j@170888',
+      'src/third_party/openssl':
+      '/trunk/deps/third_party/openssl@253925',
+      'src/third_party/httpcomponents-client':
+      '/trunk/deps/third_party/httpcomponents-client@170888',
+      'src/pdf':
+      None,
+      'src/third_party/lss':
+      Var("linux-syscall-support") + '/trunk/lss@24',
+      'src/third_party/libaddressinput/src/cpp':
+      None,
+      'src/third_party/jsr-305/src':
+      Var("jsr-305") + '/trunk@51',
+      'src/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille':
+      Var("eyes-free") + '/trunk/braille/client/src/com/googlecode/eyesfree/braille@797',
+      'src/third_party/httpcomponents-core':
+      '/trunk/deps/third_party/httpcomponents-core@170888',
+   },
 }
 
 deps = {
-  "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1271",
-
-  "src/sdch/open-vcdiff":
-    (Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
-
-  "src/testing/gtest":
-    (Var("googlecode_url") % "googletest") + "/trunk@643",
-
-  "src/testing/gmock":
-    (Var("googlecode_url") % "googlemock") + "/trunk@410",
-
-  "src/third_party/angle":
-    Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"),
-
-  "src/third_party/trace-viewer":
-    (Var("googlecode_url") % "trace-viewer") + "/trunk@1203",
-
-  "src/third_party/WebKit":
-    Var("webkit_trunk") + "@" + Var("webkit_revision"),
-
-  "src/third_party/WebKit/LayoutTests/w3c/web-platform-tests":
-    Var("chromium_git") +
-    "/external/w3c/web-platform-tests.git@ac4322a338be82b3d8b722917d6d3d057c0a3f6a",
-
-  "src/third_party/WebKit/LayoutTests/w3c/csswg-test":
-    Var("chromium_git") +
-    "/external/w3c/csswg-test.git@8c415e3215a203fa3a22dbdd1799279fdf44c81e",
-
-  "src/third_party/icu":
-    "/trunk/deps/third_party/icu46@249466",
-
-  "src/third_party/libexif/sources":
-    "/trunk/deps/third_party/libexif/sources@146817",
-
-  "src/third_party/hunspell":
-   "/trunk/deps/third_party/hunspell@256272",
-
-  "src/third_party/hunspell_dictionaries":
-    "/trunk/deps/third_party/hunspell_dictionaries@193701",
-
-  "src/third_party/safe_browsing/testing":
-    (Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@112",
-
-  "src/third_party/cacheinvalidation/src":
-    (Var("googlecode_url") % "google-cache-invalidation-api") +
-    "/trunk/src@330",
-
-  "src/third_party/leveldatabase/src":
-    (Var("googlecode_url") % "leveldb") + "/trunk@79",
-
-  "src/third_party/libc++/trunk":
-    Var("llvm_url") + "/libcxx/trunk@" + Var("libcxx_revision"),
-
-  "src/third_party/libc++abi/trunk":
-    Var("llvm_url") + "/libcxxabi/trunk@" + Var("libcxxabi_revision"),
-
-  "src/third_party/snappy/src":
-    (Var("googlecode_url") % "snappy") + "/trunk@80",
-
-  "src/tools/grit":
-    (Var("googlecode_url") % "grit-i18n") + "/trunk@155",
-
-  "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1860",
-
-  "src/tools/swarming_client":
-    Var("chromium_git") + "/external/swarming.client.git@" +
-        Var("swarming_revision"),
-
-  "src/v8":
-    (Var("googlecode_url") % "v8") + "/" + Var("v8_branch") + "@" +
-    Var("v8_revision"),
-
-  "src/native_client":
-    Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
-
-  "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/gyp":
-    (Var("googlecode_url") % "skia") + "/trunk/gyp@" + Var("skia_revision"),
-
-  "src/third_party/skia/include":
-    (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
-
-  "src/third_party/ots":
-    (Var("googlecode_url") % "ots") + "/trunk@110",
-
-  "src/third_party/brotli/src":
-    Var("chromium_git") +
-    "/external/font-compression-reference.git@7f848593bd2ec83f4537b6d494a5bf55b9bd4456",
-
-  "src/tools/page_cycler/acid3":
-    "/trunk/deps/page_cycler/acid3@171600",
-
-  "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/chrome/test/data/perf/third_party/octane":
-    (Var("googlecode_url") % "octane-benchmark") + "/trunk@19",
-
-  "src/third_party/bidichecker":
-    (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4",
-
-  "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"),
-
-  # Make sure you update the two functional.DEPS and webdriver.DEPS too.
-  "src/third_party/webdriver/pylib":
-    (Var("googlecode_url") % "selenium") + "/trunk/py@18337",
-
-  "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/talk":
-    (Var("googlecode_url") % "webrtc") + "/trunk/talk@" +
-    Var("webrtc_revision"),
-
-  "src/third_party/usrsctp/usrsctplib":
-    (Var("googlecode_url") % "sctp-refimpl") +
-    "/trunk/KERN/usrsctp/usrsctplib@8723",
-
-  "src/third_party/libsrtp":
-    "/trunk/deps/third_party/libsrtp@250757",
-
-  "src/third_party/speex":
-    "/trunk/deps/third_party/speex@198168",
-
-  "src/third_party/yasm/source/patched-yasm":
-    "/trunk/deps/third_party/yasm/patched-yasm@167605",
-
-  "src/third_party/libjpeg_turbo":
-    "/trunk/deps/third_party/libjpeg_turbo@251747",
-
-  "src/third_party/flac":
-    "/trunk/deps/third_party/flac@222897",
-
-  "src/third_party/pyftpdlib/src":
-    (Var("googlecode_url") % "pyftpdlib") + "/trunk@977",
-
-  "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/webrtc@" + Var("webrtc_revision"),
-
-  "src/third_party/openmax_dl":
-    (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@5569",
-
-  "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@979",
-
-  "src/third_party/smhasher/src":
-    (Var("googlecode_url") % "smhasher") + "/trunk@151",
-
-  "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"),
-  "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/tools/deps2git":
-    "/trunk/tools/deps2git@248305",
-
-  "src/third_party/clang_format/script":
-    Var("llvm_url") + "/cfe/trunk/tools/clang-format@202065",
-
-  "src/third_party/webpagereplay":
-    (Var("googlecode_url") % "web-page-replay") + "/trunk@544",
-
-  "src/third_party/pywebsocket/src":
-    (Var("googlecode_url") % "pywebsocket") + "/trunk/src@662",
-
-  "src/third_party/opus/src":
-    "/trunk/deps/third_party/opus@237544",
-
-  "src/media/cdm/ppapi/api":
-    "/trunk/deps/cdm@249141",
-
-  "src/third_party/mesa/src":
-    "/trunk/deps/third_party/mesa@254411",
-
-  "src/third_party/cld_2/src":
-    (Var("googlecode_url") % "cld2") + "/trunk@84",
-
-  "src/chrome/browser/resources/pdf/html_office":
-     Var("chromium_git") +
-         "/chromium/html-office-public.git@9f76cc282c471ae4ff77415384db039fcab2faa8",
-
-  "src/third_party/libwebm/source":
-    Var("chromium_git") +
-      "/webm/libwebm.git@0f7815b036651e242ec8c2fcfb59fe54f69be1a8",
+   'src/third_party/sfntly/cpp/src':
+      Var("sfntly") + '/trunk/cpp/src@228',
+   'src/third_party/libc++/trunk':
+      'http://src.chromium.org/llvm-project/libcxx/trunk@197314',
+   'src/third_party/skia/include':
+      Var("skia") + '/trunk/include@13732',
+   'src/third_party/libc++abi/trunk':
+      'http://src.chromium.org/llvm-project/libcxxabi/trunk@197063',
+   'build/scripts/private/data/reliability':
+      '/trunk/src/chrome/test/data/reliability@237714',
+   'src/third_party/flac':
+      '/trunk/deps/third_party/flac@222897',
+   'src/media/cdm/ppapi/api':
+      '/trunk/deps/cdm@249141',
+   'src/chrome/test/data/perf/frame_rate/content':
+      '/trunk/deps/frame_rate/content@93671',
+   'src/third_party/ots':
+      Var("ots") + '/trunk@110',
+   'src/third_party/libaddressinput/src/testdata':
+      Var("libaddressinput") + '/trunk/testdata@176',
+   'src/third_party/mesa/src':
+      '/trunk/deps/third_party/mesa@254411',
+   'src/third_party/hunspell_dictionaries':
+      '/trunk/deps/third_party/hunspell_dictionaries@193701',
+   'src/third_party/brotli/src':
+      Var("git.chromium.org") + '/external/font-compression-reference.git@7f848593bd2ec83f4537b6d494a5bf55b9bd4456',
+   'src/third_party/cacheinvalidation/src':
+      Var("google-cache-invalidation-api") + '/trunk/src@330',
+   'src/chrome/test/data/perf/third_party/octane':
+      Var("octane-benchmark") + '/trunk@19',
+   'src/third_party/skia/gyp':
+      Var("skia") + '/trunk/gyp@13732',
+   'src/third_party/scons-2.0.1':
+      Var("native_client") + '/trunk/src/third_party/scons-2.0.1@12760',
+   'src/third_party/webdriver/pylib':
+      Var("selenium") + '/trunk/py@18337',
+   'src/third_party/cld_2/src':
+      Var("cld2") + '/trunk@84',
+   'src':
+      '/branches/1885/src@256414',
+   'src/third_party/libyuv':
+      Var("libyuv") + '/trunk@979',
+   'src/third_party/hunspell':
+      '/trunk/deps/third_party/hunspell@256272',
+   'src/third_party/libphonenumber/src/phonenumbers':
+      Var("libphonenumber") + '/trunk/cpp/src/phonenumbers@621',
+   'src/third_party/libphonenumber/src/resources':
+      Var("libphonenumber") + '/trunk/resources@621',
+   'src/third_party/safe_browsing/testing':
+      Var("google-safe-browsing") + '/trunk/testing@112',
+   'src/sdch/open-vcdiff':
+      Var("open-vcdiff") + '/trunk@42',
+   'src/third_party/pyftpdlib/src':
+      Var("pyftpdlib") + '/trunk@977',
+   'src/third_party/libaddressinput/src/cpp':
+      Var("libaddressinput") + '/trunk/cpp@176',
+   'src/third_party/WebKit/LayoutTests/w3c/csswg-test':
+      Var("git.chromium.org") + '/external/w3c/csswg-test.git@8c415e3215a203fa3a22dbdd1799279fdf44c81e',
+   'src/third_party/snappy/src':
+      Var("snappy") + '/trunk@80',
+   'src/third_party/webrtc':
+      Var("webrtc") + '/trunk/webrtc@5679',
+   'src/tools/deps2git':
+      '/trunk/tools/deps2git@248305',
+   'src/third_party/libjpeg_turbo':
+      '/trunk/deps/third_party/libjpeg_turbo@251747',
+   'src/third_party/pywebsocket/src':
+      Var("pywebsocket") + '/trunk/src@662',
+   'depot_tools':
+      '/trunk/tools/depot_tools@256386',
+   'src/third_party/bidichecker':
+      Var("bidichecker") + '/trunk/lib@4',
+   'commit-queue':
+      '/trunk/tools/commit-queue@249148',
+   'src/breakpad/src':
+      Var("google-breakpad") + '/trunk/src@1271',
+   'src/third_party/openmax_dl':
+      Var("webrtc") + '/deps/third_party/openmax@5569',
+   'src/third_party/jsoncpp/source/src/lib_json':
+      Var("jsoncpp") + '/trunk/jsoncpp/src/lib_json@248',
+   'src/third_party/clang_format/script':
+      'http://src.chromium.org/llvm-project/cfe/trunk/tools/clang-format@202065',
+   'src/third_party/WebKit/LayoutTests/w3c/web-platform-tests':
+      Var("git.chromium.org") + '/external/w3c/web-platform-tests.git@ac4322a338be82b3d8b722917d6d3d057c0a3f6a',
+   'build/scripts/gsd_generate_index':
+      '/trunk/tools/gsd_generate_index@164784',
+   'src/third_party/webgl/src':
+      Var("git.chromium.org") + '/external/khronosgroup/webgl.git@159f31dd34842c871032d97d360a9dce5153f585',
+   'src/testing/gmock':
+      Var("googlemock") + '/trunk@410',
+   'src/third_party/skia/src':
+      Var("skia") + '/trunk/src@13732',
+   'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
+      Var("native_client") + '/trunk/src/native_client/tests/prebuilt@12835',
+   'src/third_party/smhasher/src':
+      Var("smhasher") + '/trunk@151',
+   'src/third_party/webpagereplay':
+      Var("web-page-replay") + '/trunk@544',
+   'build/scripts/tools/deps2git':
+      '/trunk/tools/deps2git@256390',
+   'src/native_client':
+      Var("native_client") + '/trunk/src/native_client@12835',
+   'src/tools/page_cycler/acid3':
+      '/trunk/deps/page_cycler/acid3@171600',
+   'src/third_party/leveldatabase/src':
+      Var("leveldb") + '/trunk@79',
+   'build':
+      '/trunk/tools/build@256402',
+   'src/tools/gyp':
+      Var("gyp") + '/trunk@1860',
+   'src/chrome/test/data/perf/canvas_bench':
+      '/trunk/deps/canvas_bench@122605',
+   'src/third_party/ffmpeg':
+      '/trunk/deps/third_party/ffmpeg@255431',
+   'src/third_party/libjingle/source/talk':
+      Var("webrtc") + '/trunk/talk@5679',
+   'src/third_party/usrsctp/usrsctplib':
+      Var("sctp-refimpl") + '/trunk/KERN/usrsctp/usrsctplib@8723',
+   'src/third_party/libexif/sources':
+      '/trunk/deps/third_party/libexif/sources@146817',
+   'build/third_party/lighttpd':
+      '/trunk/deps/third_party/lighttpd@58968',
+   'src/third_party/jsoncpp/source/include':
+      Var("jsoncpp") + '/trunk/jsoncpp/include@248',
+   'src/third_party/libsrtp':
+      '/trunk/deps/third_party/libsrtp@250757',
+   'src/third_party/libphonenumber/src/test':
+      Var("libphonenumber") + '/trunk/cpp/test@621',
+   'src/third_party/trace-viewer':
+      Var("trace-viewer") + '/trunk@1203',
+   'src/third_party/yasm/source/patched-yasm':
+      '/trunk/deps/third_party/yasm/patched-yasm@167605',
+   'build/scripts/command_wrapper/bin':
+      '/trunk/tools/command_wrapper/bin@135178',
+   'src/testing/gtest':
+      Var("googletest") + '/trunk@643',
+   'src/third_party/WebKit':
+      Var("webkit_trunk")[:-6] + '/branches/chromium/1885@168971',
+   'src/third_party/icu':
+      '/trunk/deps/third_party/icu46@249466',
+   'src/third_party/speex':
+      '/trunk/deps/third_party/speex@198168',
+   'src/third_party/opus/src':
+      '/trunk/deps/third_party/opus@237544',
+   'src/tools/grit':
+      Var("grit-i18n") + '/trunk@155',
+   'src/tools/swarming_client':
+      Var("git.chromium.org") + '/external/swarming.client.git@dd806d645e711260c24bf7a2f061d6db091c3715',
+   'src/chrome/browser/resources/pdf/html_office':
+      Var("git.chromium.org") + '/chromium/html-office-public.git@9f76cc282c471ae4ff77415384db039fcab2faa8',
+   'src/third_party/angle':
+      Var("git.chromium.org") + '/angle/angle.git@fa63e947cb3eccf463648d21a05d5002c9b8adfa',
+   'src/v8':
+      Var("v8") + '/trunk@19696',
+   'src/third_party/libwebm/source':
+      Var("git.chromium.org") + '/webm/libwebm.git@0f7815b036651e242ec8c2fcfb59fe54f69be1a8',
+   'src/third_party/libvpx':
+      '/trunk/deps/third_party/libvpx@255831',
+   'src/third_party/swig/Lib':
+      '/trunk/deps/third_party/swig/Lib@230490',
 }
 
+skip_child_includes =  ['breakpad', 'delegate_execute', 'metro_driver', 'native_client_sdk', 'o3d', 'pdf', 'sdch', 'skia', 'testing', 'third_party', 'v8', 'win8'] 
 
-deps_os = {
-  "win": {
-    "src/chrome/tools/test/reference_build/chrome_win":
-      "/trunk/deps/reference_builds/chrome_win@254637",
+hooks =  [{'action': ['python', 'src/build/download_nacl_toolchains.py', '--no-arm-trusted', '--keep'], 'pattern': '.', 'name': 'nacltools'}, {'action': ['python', 'src/build/linux/install-arm-sysroot.py', '--linux-only'], 'pattern': '.', 'name': 'sysroot'}, {'action': ['python', 'src/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py', '--linux-only', '--arch=amd64'], 'pattern': '.', 'name': 'sysroot'}, {'action': ['python', 'src/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py', '--linux-only', '--arch=i386'], 'pattern': '.', 'name': 'sysroot'}, {'action': ['python', 'src/tools/clang/scripts/update.py', '--mac-only'], 'pattern': '.', 'name': 'clang'}, {'action': ['python', 'src/build/util/lastchange.py', '-o', 'src/build/util/LASTCHANGE'], 'pattern': '.', 'name': 'lastchange'}, {'action': ['python', 'src/build/util/lastchange.py', '-s', 'src/third_party/WebKit', '-o', 'src/build/util/LASTCHANGE.blink'], 'pattern': '.', 'name': 'lastchange'}, {'action': ['download_from_google_storage', '--no_resume', '--platform=win32', '--no_auth', '--bucket', 'chromium-clang-format', '-s', 'src/third_party/clang_format/bin/win/clang-format.exe.sha1'], 'pattern': 'src/third_party/clang_format/bin/win/clang-format.exe.sha1', 'name': 'clang_format_win'}, {'action': ['download_from_google_storage', '--no_resume', '--platform=darwin', '--no_auth', '--bucket', 'chromium-clang-format', '-s', 'src/third_party/clang_format/bin/mac/clang-format.sha1'], 'pattern': 'src/third_party/clang_format/bin/mac/clang-format.sha1', 'name': 'clang_format_mac'}, {'action': ['download_from_google_storage', '--no_resume', '--platform=linux*', '--no_auth', '--bucket', 'chromium-clang-format', '-s', 'src/third_party/clang_format/bin/linux/clang-format.sha1'], 'pattern': 'src/third_party/clang_format/bin/linux/clang-format.sha1', 'name': 'clang_format_linux'}, {'action': ['download_from_google_storage', '--no_resume', '--platform=linux*', '--no_auth', '--bucket', 'chromium-eu-strip', '-s', 'src/build/linux/bin/eu-strip.sha1'], 'pattern': 'src/build/linux/bin/eu-strip.sha1', 'name': 'eu-strip'}, {'action': ['python', 'src/build/gyp_chromium'], 'pattern': '.', 'name': 'gyp'}] 
 
-    "src/third_party/cygwin":
-      "/trunk/deps/third_party/cygwin@231940",
-
-    "src/third_party/psyco_win32":
-      "/trunk/deps/third_party/psyco_win32@237949",
-
-    "src/third_party/bison":
-      "/trunk/deps/third_party/bison@147303",
-
-    "src/third_party/gperf":
-      "/trunk/deps/third_party/gperf@147304",
-
-    "src/third_party/perl":
-      "/trunk/deps/third_party/perl@147900",
-
-    "src/third_party/lighttpd":
-      "/trunk/deps/third_party/lighttpd@" + Var("lighttpd_revision"),
-
-    # 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")),
-
-    # Dependencies used by libjpeg-turbo
-    "src/third_party/yasm/binaries":
-      "/trunk/deps/third_party/yasm/binaries@154708",
-
-    # 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@2058",
-
-    # Binaries for nacl sdk.
-    "src/third_party/nacl_sdk_binaries":
-      "/trunk/deps/third_party/nacl_sdk_binaries@111576",
-  },
-  "ios": {
-    "src/third_party/google_toolbox_for_mac/src":
-      (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@" +
-      Var("google_toolbox_for_mac_revision"),
-
-    "src/third_party/nss":
-      "/trunk/deps/third_party/nss@" + Var("nss_revision"),
-
-    # class-dump utility to generate header files for undocumented SDKs
-    "src/testing/iossim/third_party/class-dump":
-      "/trunk/deps/third_party/class-dump@199203",
-
-    # Code that's not needed due to not building everything
-    "src/build/util/support": None,
-    "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": None,
-    "src/third_party/bidichecker": None,
-    "src/third_party/brotli/src": 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/libaddressinput/src/cpp": None,
-    "src/third_party/libaddressinput/src/testdata": None,
-    "src/third_party/libc++/trunk": None,
-    "src/third_party/libc++abi/trunk": None,
-    "src/third_party/libexif/sources": None,
-    "src/third_party/libjpeg_turbo": None,
-    "src/third_party/libsrtp": None,
-    "src/third_party/libvpx": None,
-    "src/third_party/libyuv": None,
-    "src/third_party/mesa/src": None,
-    "src/third_party/opus/src": None,
-    "src/third_party/openmax_dl": None,
-    "src/third_party/ots": 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/speex": None,
-    "src/third_party/swig/Lib": 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/WebKit/LayoutTests/w3c/web-platform-tests": None,
-    "src/third_party/WebKit/LayoutTests/w3c/csswg-test": None,
-    "src/third_party/yasm/source/patched-yasm": None,
-    "src/tools/page_cycler/acid3": None,
-    "src/v8": None,
-  },
-  "mac": {
-    "src/chrome/tools/test/reference_build/chrome_mac":
-      "/trunk/deps/reference_builds/chrome_mac@255182",
-
-    "src/third_party/google_toolbox_for_mac/src":
-      (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@" +
-      Var("google_toolbox_for_mac_revision"),
-
-    "src/third_party/pdfsqueeze":
-      (Var("googlecode_url") % "pdfsqueeze") + "/trunk@5",
-
-    "src/third_party/lighttpd":
-      "/trunk/deps/third_party/lighttpd@" + Var("lighttpd_revision"),
-
-    "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@" + Var("nss_revision"),
-
-    "src/chrome/installer/mac/third_party/xz/xz":
-      "/trunk/deps/third_party/xz@233311",
-  },
-  "unix": {
-    # Linux, really.
-    "src/chrome/tools/test/reference_build/chrome_linux":
-      "/trunk/deps/reference_builds/chrome_linux@254637",
-
-    "src/third_party/xdg-utils":
-      "/trunk/deps/third_party/xdg-utils@203785",
-
-    "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@" + Var("openssl_revision"),
-
-    "src/third_party/gold":
-      "/trunk/deps/third_party/gold@228995",
-
-    "src/third_party/libmtp":
-      "/trunk/deps/third_party/libmtp@206535",
-
-    # Used on Linux only. CrOS already has a copy.
-    "src/third_party/mtpd/source":
-      Var("chromiumos_git") + "/platform/mtpd.git" +
-      "@e4e4656e9aa710f0617dab8746ab6116c0506ceb",
-
-    # Used on Linux only. CrOS already has a copy.
-    "src/third_party/cros_dbus_cplusplus/source":
-      Var("chromiumos_git") + "/third_party/dbus-cplusplus.git" +
-      "@e4120532bbf3ca9f743b0be1f539381a54d16867",
-
-    # For Linux and Chromium OS.
-    "src/third_party/cros_system_api":
-      Var("chromiumos_git") + "/platform/system_api.git" +
-      "@185a40a27c15a6187328b00159f2b42047a66572",
-
-    # Note that this is different from Android's freetype repo.
-    "src/third_party/freetype2/src":
-      Var("chromium_git") + "/chromium/src/third_party/freetype2.git" +
-      "@d699c2994ecc178c4ed05ac2086061b2034c2178",
-
-    # Build tools for targeting ChromeOS.
-    "src/third_party/chromite":
-      Var("chromiumos_git") + "/chromite.git" +
-      "@1ee2901d33ae698d1f2a1d95e9f3fd5bbd5f13f9",
-
-    # Dependency of chromite.git.
-    "src/third_party/pyelftools":
-      Var("chromiumos_git") + "/third_party/pyelftools.git" +
-      "@bdc1d380acd88d4bfaf47265008091483b0d614e",
-
-    "src/third_party/undoview":
-      "/trunk/deps/third_party/undoview@119694",
-
-    "src/third_party/liblouis/src":
-      Var("chromium_git") +
-      "/external/liblouis.git@3c2daee56250162e5a75830871601d74328d39f5",
-
-    # Used for embedded builds. CrOS & Linux use the system version.
-    "src/third_party/fontconfig/src":
-      Var("chromium_git") + "/external/fontconfig.git" +
-      "@f16c3118e25546c1b749f9823c51827a60aeb5c1",
-  },
-  "android": {
-    "src/third_party/android_tools":
-      Var("chromium_git") + "/android_tools.git" +
-      "@0582bdc17b4829beb522975441546a4eb99b11b5",
-
-    "src/third_party/aosp":
-      "/trunk/deps/third_party/aosp@148330",
-
-    "src/third_party/apache-mime4j":
-      "/trunk/deps/third_party/apache-mime4j@170888",
-
-    "src/third_party/findbugs":
-      "/trunk/deps/third_party/findbugs@245039",
-
-    "src/third_party/freetype":
-      Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
-      "@a2b9955b49034a51dfbc8bf9f4e9d312149cecac",
-
-    "src/third_party/guava/src":
-      Var("chromium_git") + "/external/guava-libraries.git" +
-      "@c523556ab7d0f05afadebd20e7768d4c16af8771",
-
-    "src/third_party/httpcomponents-client":
-      "/trunk/deps/third_party/httpcomponents-client@170888",
-
-    "src/third_party/httpcomponents-core":
-      "/trunk/deps/third_party/httpcomponents-core@170888",
-
-    "src/third_party/jarjar":
-      "/trunk/deps/third_party/jarjar@170888",
-
-    "src/third_party/jsr-305/src":
-      (Var("googlecode_url") % "jsr-305") + "/trunk@51",
-
-    "src/third_party/lss":
-      ((Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@" +
-       Var("lss_revision")),
-
-    "src/third_party/openssl":
-      "/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
-
-    "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,
-  },
-}
-
-
-include_rules = [
-  # Everybody can use some things.
-  "+base",
-  "+build",
-  "+ipc",
-
-  # Everybody can use headers generated by tools/generate_library_loader.
-  "+library_loaders",
-
-  "+testing",
-  "+third_party/icu/source/common/unicode",
-  "+third_party/icu/source/i18n/unicode",
-  "+url",
-]
-
-
-# checkdeps.py shouldn't check include paths for files in these dirs:
-skip_child_includes = [
-  "breakpad",
-  "delegate_execute",
-  "metro_driver",
-  "native_client_sdk",
-  "o3d",
-  "pdf",
-  "sdch",
-  "skia",
-  "testing",
-  "third_party",
-  "v8",
-  "win8",
-]
-
-
-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.
-    "name": "nacltools",
-    "pattern": ".",
-    "action": [
-        "python", "src/build/download_nacl_toolchains.py",
-         "--no-arm-trusted",
-         "--keep",
-    ],
-  },
-  {
-    # 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.
-    "name": "sysroot",
-    "pattern": ".",
-    "action": ["python", "src/build/linux/install-arm-sysroot.py",
-               "--linux-only"],
-  },
-  {
-    # 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.
-    "name": "sysroot",
-    "pattern": ".",
-    "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.
-    "name": "sysroot",
-    "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.
-    "name": "clang",
-    "pattern": ".",
-    "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"],
-  },
-  {
-    # Update LASTCHANGE. This is also run by export_tarball.py in
-    # src/tools/export_tarball - please keep them in sync.
-    "name": "lastchange",
-    "pattern": ".",
-    "action": ["python", "src/build/util/lastchange.py",
-               "-o", "src/build/util/LASTCHANGE"],
-  },
-  {
-    # Update LASTCHANGE.blink. This is also run by export_tarball.py in
-    # src/tools/export_tarball - please keep them in sync.
-    "name": "lastchange",
-    "pattern": ".",
-    "action": ["python", "src/build/util/lastchange.py",
-               "-s", "src/third_party/WebKit",
-               "-o", "src/build/util/LASTCHANGE.blink"],
-  },
-  # Pull clang-format binaries using checked-in hashes.
-  {
-    "name": "clang_format_win",
-    "pattern": "src/third_party/clang_format/bin/win/clang-format.exe.sha1",
-    "action": [ "download_from_google_storage",
-                "--no_resume",
-                "--platform=win32",
-                "--no_auth",
-                "--bucket", "chromium-clang-format",
-                "-s", "src/third_party/clang_format/bin/win/clang-format.exe.sha1",
-    ],
-  },
-  {
-    "name": "clang_format_mac",
-    "pattern": "src/third_party/clang_format/bin/mac/clang-format.sha1",
-    "action": [ "download_from_google_storage",
-                "--no_resume",
-                "--platform=darwin",
-                "--no_auth",
-                "--bucket", "chromium-clang-format",
-                "-s", "src/third_party/clang_format/bin/mac/clang-format.sha1",
-    ],
-  },
-  {
-    "name": "clang_format_linux",
-    "pattern": "src/third_party/clang_format/bin/linux/clang-format.sha1",
-    "action": [ "download_from_google_storage",
-                "--no_resume",
-                "--platform=linux*",
-                "--no_auth",
-                "--bucket", "chromium-clang-format",
-                "-s", "src/third_party/clang_format/bin/linux/clang-format.sha1",
-    ],
-  },
-  # Pull eu-strip binaries using checked-in hashes.
-  {
-    "name": "eu-strip",
-    "pattern": "src/build/linux/bin/eu-strip.sha1",
-    "action": [ "download_from_google_storage",
-                "--no_resume",
-                "--platform=linux*",
-                "--no_auth",
-                "--bucket", "chromium-eu-strip",
-                "-s", "src/build/linux/bin/eu-strip.sha1",
-    ],
-  },
-  {
-    # A change to a .gyp, .gypi, or to GYP itself should run the generator.
-    "name": "gyp",
-    "pattern": ".",
-    "action": ["python", "src/build/gyp_chromium"],
-  },
-]
+include_rules =  ['+base', '+build', '+ipc', '+library_loaders', '+testing', '+third_party/icu/source/common/unicode', '+third_party/icu/source/i18n/unicode', '+url']
\ No newline at end of file