Undo Windows gyp split from r42397, and update for new gyp changes.

DEPS

 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
   "webkit_revision": "56476",
   "ffmpeg_revision": "42314",
   "skia_revision": "504",
   "chromium_git": "http://src.chromium.org/git",
   "swig_revision": "40423",
   "nacl_revision": "1794",
 }
@@ skipping 19 matching lines @@
 
   "src/third_party/icu":
     "/trunk/deps/third_party/icu42@42287",
 
   "src/third_party/hunspell":
    "/trunk/deps/third_party/hunspell128@41000",
 
   "src/third_party/protobuf2/src":
     "http://protobuf.googlecode.com/svn/trunk@305",
 
+  "src/tools/gyp":
+    "http://gyp.googlecode.com/svn/trunk@804",
+
   "src/v8":
     "http://v8.googlecode.com/svn/trunk@4255",
 
   "src/native_client":
     "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" +
     Var("nacl_revision"),
 
   "src/third_party/skia/src":
     "http://skia.googlecode.com/svn/trunk/src@" + Var("skia_revision"),
 
@@ skipping 88 matching lines @@
     # NSS, for SSLClientSocketNSS.
     "src/third_party/nss":
       "/trunk/deps/third_party/nss@39612",
 
     "src/third_party/swig/win":
       "/trunk/deps/third_party/swig/win@" + Var("swig_revision"),
 
     "src/third_party/mingw-w64/mingw/bin":
       ("http://nativeclient.googlecode.com/svn/trunk/src/third_party/mingw-w64/mingw/bin@" +
        Var("nacl_revision")),
-
-    "src/tools/gyp":
-      "http://gyp.googlecode.com/svn/trunk@794",
-
   },
   "mac": {
     "src/chrome/tools/test/reference_build/chrome_mac":
       "/trunk/deps/reference_builds/chrome_mac@41963",
 
     "src/third_party/GTM":
       "http://google-toolbox-for-mac.googlecode.com/svn/trunk@312",
     "src/third_party/pdfsqueeze":
       "http://pdfsqueeze.googlecode.com/svn/trunk@2",
     "src/third_party/lighttpd":
       "/trunk/deps/third_party/lighttpd@33737",
 
     "src/third_party/WebKit/WebKit/mac":
       Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
     "src/third_party/WebKit/WebKitLibraries":
       Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
 
     # TODO(ajwong): Move this into the OS-independent block.
     "src/third_party/yasm/source/patched-yasm":
       "/trunk/deps/third_party/yasm/patched-yasm@29937",
 
     "src/third_party/swig/mac":
       "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"),
-
-    "src/tools/gyp":
-      "http://gyp.googlecode.com/svn/trunk@800",
   },
   "unix": {
     # Linux, really.
     "src/chrome/tools/test/reference_build/chrome_linux":
       "/trunk/deps/reference_builds/chrome_linux@41515",
 
     "src/third_party/xdg-utils":
       "/trunk/deps/third_party/xdg-utils@29103",
 
     # TODO(ajwong): Move this into the OS-independent block.
     "src/third_party/yasm/source/patched-yasm":
       "/trunk/deps/third_party/yasm/patched-yasm@29937",
 
     "src/third_party/swig/linux":
       "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"),
-
-    "src/tools/gyp":
-      "http://gyp.googlecode.com/svn/trunk@800",
   },
 }
 
 
 include_rules = [
   # Everybody can use some things.
   "+base",
   "+build",
   "+ipc",
 
@@ skipping 30 matching lines @@
     "action": ["python", "src/build/gyp_chromium"],
   },
   {
     # Workaround XCode dependecies problem.
     # TODO(bradnelson): remove this when fixed.
     "pattern": ".",
     "action": ["python",
                "src/build/mac/clobber_generated_headers.py"],
   },
 ]