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

DEPS

Index: DEPS
diff --git a/DEPS b/DEPS
index 03e882497642b720ba5cfe6910d832363d3d2640..d65a64d0504e31cfcfb14230985930ce9387f756 100644
--- a/DEPS
+++ b/DEPS
@@ -37,6 +37,9 @@ deps = {
   "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",
 
@@ -145,10 +148,6 @@ deps_os = {
     "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":
@@ -172,9 +171,6 @@ deps_os = {
 
     "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.
@@ -190,9 +186,6 @@ deps_os = {
 
     "src/third_party/swig/linux":
       "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"),
-
-    "src/tools/gyp":
-      "http://gyp.googlecode.com/svn/trunk@800",
   },
 }