Revert 193992 "Lets try this again."

trunk/src/net/net.gyp

Index: trunk/src/net/net.gyp
===================================================================
--- trunk/src/net/net.gyp	(revision 194148)
+++ trunk/src/net/net.gyp	(working copy)
@@ -50,12 +50,12 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../sdch/sdch.gyp:sdch',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/zlib/zlib.gyp:zlib',
-        '../url/url.gyp:url',
         'net_resources',
       ],
       'sources': [
@@ -1390,11 +1390,11 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
-        '../url/url.gyp:url',
         'net',
         'net_test_support',
       ],
@@ -1976,7 +1976,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_perf',
-        '../url/url.gyp:url',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../testing/gtest.gyp:gtest',
         'net',
         'net_test_support',
@@ -2015,8 +2015,8 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../testing/gtest.gyp:gtest',
-        '../url/url.gyp:url',
         'net',
       ],
       'export_dependent_settings': [
@@ -2208,7 +2208,7 @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../url/url.gyp:url',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../v8/tools/gyp/v8.gyp:v8',
             'net'
           ],
@@ -2279,8 +2279,8 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../testing/gtest.gyp:gtest',
-            '../url/url.gyp:url',
             'net',
             'net_with_v8',
           ],
@@ -2296,7 +2296,7 @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../url/url.gyp:url',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
             'net',
           ],
           'sources': [
@@ -2333,7 +2333,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../url/url.gyp:url',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
             'net',
           ],
           'sources': [
@@ -2396,7 +2396,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../url/url.gyp:url',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
           ],
           'sources': [
             'tools/tld_cleanup/tld_cleanup.cc',
@@ -2489,8 +2489,8 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../third_party/openssl/openssl.gyp:openssl',
-            '../url/url.gyp:url',
             'flip_balsa_and_epoll_library',
             'net',
           ],