Revert "Rework the deps so that we pull all of Blink into third_party/WebKit"

DEPS

 # When adding a new dependency, please update the top-level .gitignore file
 # to list the dependency's destination directory.
 
 vars = {
   # Use this googlecode_url variable only if there is an internal mirror for it.
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
@@ skipping 63 matching lines @@
 
   "src/testing/gmock":
     (Var("googlecode_url") % "googlemock") + "/trunk@410",
 
   "src/third_party/angle":
     (Var("googlecode_url") % "angleproject") + "/trunk@2184",
 
   "src/third_party/trace-viewer":
     (Var("googlecode_url") % "trace-viewer") + "/trunk@255",
 
+  # 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":
-    Var("webkit_trunk") + "@" + Var("webkit_revision"),
+    "/trunk/deps/third_party/WebKit@76115",
 
   "src/third_party/icu":
     "/trunk/deps/third_party/icu46@192960",
 
   "src/third_party/libexif/sources":
     "/trunk/deps/third_party/libexif/sources@146817",
 
   "src/third_party/hunspell":
    "/trunk/deps/third_party/hunspell@184822",
 
@@ skipping 41 matching lines @@
 
   "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/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@97",
 
   "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/v8-i18n":
     (Var("googlecode_url") % "v8-i18n") + "/trunk@174",
 
   # 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@170088",
 
   # 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.
-  #
-  # TODO: crbug.com/230215. Remove these and update the tests to pull directly
-  # from the Blink repo since the layout tests are now always checked out.
   "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":
@@ skipping 269 matching lines @@
     "src/third_party/sfntly/cpp/src": None,
     "src/third_party/smhasher/src": None,
     "src/third_party/snappy/src": None,
     "src/third_party/swig/Lib": None,
     "src/third_party/undoview": None,
     "src/third_party/v8-i18n": None,
     "src/third_party/webdriver/pylib": None,
     "src/third_party/webpagereplay": None,
     "src/third_party/webrtc": None,
     "src/third_party/WebKit": None,
+    "src/third_party/WebKit/LayoutTests": None,
+    "src/third_party/WebKit/Source": None,
+    "src/third_party/WebKit/Tools/DumpRenderTree": None,
+    "src/third_party/WebKit/Tools/Scripts": None,
+    "src/third_party/WebKit/Tools/TestWebKitAPI": 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@137727",
 
     "src/third_party/GTM":
       (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@" +
@@ skipping 24 matching lines @@
     "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/WebKit/Tools/gdb":
+      Var("webkit_trunk") + "/Tools/gdb@" + Var("webkit_revision"),
+
     "src/third_party/gold":
       "/trunk/deps/third_party/gold@168091",
 
     "src/third_party/libmtp":
       "/trunk/deps/third_party/libmtp@178673",
 
     # Used on Linux only. CrOS already has a copy.
     "src/third_party/mtpd/source":
       Var("chromiumos_git") + "/platform/mtpd.git" +
       "@132604f107368f617a3073ba2d515b78641ceeed",
@@ skipping 148 matching lines @@
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
     "action": ["python", "src/build/gyp_chromium"],
   },
   {
     # Check for landmines (reasons to clobber the build).
     "pattern": ".",
     "action": ["python", "src/build/landmines.py"],
   },
 ]