Revert 193968 "Roll the DEPS for google-url."

> Roll the DEPS for google-url.
> 
> And update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
> 
> This also changes googleurl.gyp to reference the files under url/, so that we
> don't break the Blink tree.
> 
> BUG=229660
> R=brettw@chromium.org
> TBR=brettw@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/14089011

TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14028012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193983 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 20 insertions, 20 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 61f08cd..ff515d6 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -26,6 +26,7 @@
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         'variations_seed_proto',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../components/components.gyp:encryptor',
         '../components/components.gyp:user_prefs',
         '../components/components.gyp:visitedlink_browser',
@@ -54,7 +55,6 @@
         '../ui/ui.gyp:shell_dialogs',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
-        '../url/url.gyp:url',
         '../webkit/support/webkit_support.gyp:user_agent',
       ],
       'include_dirs': [
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 32af5cb..a239e25 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -44,10 +44,11 @@
         'safe_browsing_report_proto',
         'variations_seed_proto',
         '../build/linux/system.gyp:dbus',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chromeos/chromeos.gyp:chromeos',
-        '../chromeos/ime/input_method.gyp:gencode',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
+        '../chromeos/ime/input_method.gyp:gencode',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus',
         '../device/device.gyp:device_bluetooth',
@@ -75,21 +76,20 @@
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/protobuf/protobuf.gyp:protoc#host',
+        'chrome_resources.gyp:chrome_strings',
         '../third_party/re2/re2.gyp:re2',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
-        '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
-        '../url/url.gyp:url',
         '../v8/tools/gyp/v8.gyp:v8',
+        '../ui/views/controls/webview/webview.gyp:webview',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:user_agent',
         '../webkit/support/webkit_support.gyp:webkit_resources',
         '../webkit/support/webkit_support.gyp:webkit_storage',
-        'chrome_resources.gyp:chrome_strings',
       ],
       'defines': [
         '<@(nacl_defines)',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index c1fa3b2..c302f55 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -25,6 +25,7 @@
         'debugger',
         'in_memory_url_index_cache_proto',
         'installer_util',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
         '../device/device.gyp:device_bluetooth',
@@ -41,7 +42,6 @@
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
-        '../url/url.gyp:url',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:user_agent',
         '../webkit/support/webkit_support.gyp:webkit_base',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index f8c9c30..cd7297d 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -30,8 +30,9 @@
         'safe_browsing_report_proto',
         'feedback_proto',
         'variations_seed_proto',
-        '../components/components.gyp:auto_login_parser',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../components/components.gyp:autofill_risk_proto',
+        '../components/components.gyp:auto_login_parser',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
@@ -51,7 +52,6 @@
         '../ui/snapshot/snapshot.gyp:snapshot',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
-        '../url/url.gyp:url',
         '../webkit/support/webkit_support.gyp:user_agent',
       ],
       'include_dirs': [
diff --git a/chrome/chrome_browser_ui_views.gyp b/chrome/chrome_browser_ui_views.gyp
index cb3a709..a22d68e 100644
--- a/chrome/chrome_browser_ui_views.gyp
+++ b/chrome/chrome_browser_ui_views.gyp
@@ -9,9 +9,9 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../ui/ui.gyp:ui',
-        '../url/url.gyp:url',
       ],
       'conditions': [
         ['use_ash==1', {
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 010d9e2..236089f 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -32,6 +32,7 @@
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base_prefs',
         '<(DEPTH)/base/base.gyp:base_static',
+        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
         '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
@@ -48,7 +49,6 @@
         '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
-        '<(DEPTH)/url/url.gyp:url',
         '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
       ],
       'sources': [
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index ea785a5..ba04c73 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -499,6 +499,7 @@
         'common',
         'test_support_ui',
         '../base/base.gyp:base',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
@@ -506,7 +507,6 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
-        '../url/url.gyp:url',
       ],
       'include_dirs': [
         '..',
@@ -741,11 +741,11 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../third_party/zlib/zlib.gyp:minizip',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/ui.gyp:ui',
-        '../url/url.gyp:url',
       ],
       'include_dirs': [
         '..',
@@ -1057,11 +1057,11 @@
         'chromedriver2_lib',
         '../base/base.gyp:base',
         '../base/base.gyp:run_all_unittests',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:http_server',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gtest.gyp:gtest',
-        '../url/url.gyp:url',
       ],
       'include_dirs': [
         '..,'
@@ -3100,20 +3100,20 @@
                 'interactive_ui_tests',
                 # Disabled from running in coverage_posix.py.
                 # We need to build this during compile step, so enabling here.
-                '../content/content.gyp:content_browsertests',
+                'browser_tests',
                 '../courgette/courgette.gyp:courgette_unittests',
                 '../crypto/crypto.gyp:crypto_unittests',
-                '../jingle/jingle.gyp:jingle_unittests',
-                '../net/net.gyp:net_perftests',
-                '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests',
-                '../url/url.gyp:googleurl_unittests',
-                'browser_tests',
                 'chromedriver_unittests',
+                '../build/temp_gyp/googleurl.gyp:googleurl_unittests',
                 'gpu_tests',
+                '../jingle/jingle.gyp:jingle_unittests',
+                '../net/net.gyp:net_perftests',
                 'performance_ui_tests',
-                'pyautolib',
                 'reliability_tests',
                 'sync_integration_tests',
+                '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests',
+                'pyautolib',
+                '../content/content.gyp:content_browsertests',
               ]}],
             ['OS=="mac"', {
               'dependencies': [