Lets try this again.

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

> 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

TBR=michaeln@google.com
Review URL: https://codereview.chromium.org/14109014

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

39 files changed, 93 insertions, 181 deletions

diff --git a/DEPS b/DEPS
index 06a61e4..335ed7b 100644
--- a/DEPS
+++ b/DEPS
@@ -61,7 +61,7 @@ deps = {
     (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1139",
 
   "src/googleurl":
-    (Var("googlecode_url") % "google-url") + "/trunk@183",
+    (Var("googlecode_url") % "google-url") + "/trunk@185",
 
   "src/sandbox/linux/seccomp-legacy":
     (Var("googlecode_url") % "seccompsandbox") + "/trunk@189",
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 192a27b..8105854 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -19,7 +19,6 @@
         '../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',
         '../content/content.gyp:content',
         '../content/content.gyp:content_browser',
         '../ipc/ipc.gyp:ipc',
@@ -31,14 +30,15 @@
         '../ui/aura/aura.gyp:aura',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/compositor/compositor.gyp:compositor',
+        '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/oak/oak.gyp:oak',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
-        '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
+        '../url/url.gyp:url',
         'ash_resources',
         'ash_wallpaper_resources',
       ],
@@ -582,14 +582,13 @@
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:test_support_content',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
+        '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
         '../ui/aura/aura.gyp:aura_test_support',
-        '../ui/app_list/app_list.gyp:app_list',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
         '../ui/message_center/message_center.gyp:message_center',
@@ -597,10 +596,11 @@
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_test_support',
         '../ui/views/views.gyp:views',
-        '../ui/views/views.gyp:views_test_support',
         '../ui/views/views.gyp:views_examples_with_content_lib',
+        '../ui/views/views.gyp:views_test_support',
         '../ui/views/views.gyp:views_with_content_test_support',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
+        '../url/url.gyp:url',
         'ash',
         'ash_resources',
         'ash_test_support',
diff --git a/build/all.gyp b/build/all.gyp
index ec97dd0..b4cc305 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -27,8 +27,8 @@
         '../third_party/sqlite/sqlite.gyp:*',
         '../third_party/zlib/zlib.gyp:*',
         '../ui/ui.gyp:*',
+        '../url/url.gyp:*',
         '../webkit/support/webkit_support.gyp:*',
-        'temp_gyp/googleurl.gyp:*',
       ],
       'conditions': [
         ['OS!="ios"', {
@@ -203,7 +203,7 @@
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../ui/ui.gyp:ui_unittests',
-        'temp_gyp/googleurl.gyp:googleurl_unittests',
+        '../url/url.gyp:googleurl_unittests',
       ],
       'conditions': [
         ['OS!="ios"', {
@@ -458,8 +458,8 @@
             '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../url/url.gyp:googleurl_unittests',
             '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
         },
         {
@@ -489,8 +489,8 @@
             '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../url/url.gyp:googleurl_unittests',
             '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
         },
         {
@@ -500,15 +500,15 @@
             '../base/base.gyp:base_unittests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../crypto/crypto.gyp:crypto_unittests',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
-            '../net/net.gyp:net_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_unittests',
+            '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../url/url.gyp:googleurl_unittests',
           ],
         },
         {
@@ -542,7 +542,7 @@
             '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
+            '../url/url.gyp:googleurl_unittests',
           ],
         },
       ],  # targets
@@ -587,9 +587,9 @@
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../ui/views/views.gyp:views_unittests',
+            '../url/url.gyp:googleurl_unittests',
             '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
             '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
           'conditions': [
              ['target_arch!="x64"', {
@@ -644,7 +644,7 @@
             '../sql/sql.gyp:sql_unittests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
+            '../url/url.gyp:googleurl_unittests',
           ],
         },
         {
@@ -667,7 +667,7 @@
             '../sql/sql.gyp:sql_unittests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
+            '../url/url.gyp:googleurl_unittests',
           ],
         },
         {
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index 2f6f89a..1512281 100644
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/temp_gyp/googleurl.gyp
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# TODO(mark): Upstream this file to googleurl.
 {
   'variables': {
     'chromium_code': 1,
@@ -10,100 +9,13 @@
   'targets': [
     {
       'target_name': 'googleurl',
-      'type': '<(component)',
+      'type': 'none',
       'dependencies': [
-        '../../base/base.gyp:base',
-        '../../third_party/icu/icu.gyp:icudata',
-        '../../third_party/icu/icu.gyp:icui18n',
-        '../../third_party/icu/icu.gyp:icuuc',
+        '../../url/url.gyp:url',
       ],
-      'sources': [
-        '../../googleurl/src/gurl.cc',
-        '../../googleurl/src/gurl.h',
-        '../../googleurl/src/url_canon.h',
-        '../../googleurl/src/url_canon_etc.cc',
-        '../../googleurl/src/url_canon_fileurl.cc',
-        '../../googleurl/src/url_canon_filesystemurl.cc',
-        '../../googleurl/src/url_canon_host.cc',
-        '../../googleurl/src/url_canon_icu.cc',
-        '../../googleurl/src/url_canon_icu.h',
-        '../../googleurl/src/url_canon_internal.cc',
-        '../../googleurl/src/url_canon_internal.h',
-        '../../googleurl/src/url_canon_internal_file.h',
-        '../../googleurl/src/url_canon_ip.cc',
-        '../../googleurl/src/url_canon_ip.h',
-        '../../googleurl/src/url_canon_mailtourl.cc',
-        '../../googleurl/src/url_canon_path.cc',
-        '../../googleurl/src/url_canon_pathurl.cc',
-        '../../googleurl/src/url_canon_query.cc',
-        '../../googleurl/src/url_canon_relative.cc',
-        '../../googleurl/src/url_canon_stdstring.h',
-        '../../googleurl/src/url_canon_stdurl.cc',
-        '../../googleurl/src/url_file.h',
-        '../../googleurl/src/url_parse.cc',
-        '../../googleurl/src/url_parse.h',
-        '../../googleurl/src/url_parse_file.cc',
-        '../../googleurl/src/url_parse_internal.h',
-        '../../googleurl/src/url_util.cc',
-        '../../googleurl/src/url_util.h',
+      'export_dependent_settings': [
+        '../../url/url.gyp:url',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../..',
-        ],
-      },
-      'defines': [
-        'FULL_FILESYSTEM_URL_SUPPORT=1',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'defines': [
-            'GURL_DLL',
-            'GURL_IMPLEMENTATION=1',
-          ],
-          'direct_dependent_settings': {
-            'defines': [
-              'GURL_DLL',
-            ],
-          },
-        }],
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [4267, ],
-    },
-    {
-      'target_name': 'googleurl_unittests',
-      'type': 'executable',
-      'dependencies': [
-        'googleurl',
-        '../../base/base.gyp:base_i18n',
-        '../../base/base.gyp:run_all_unittests',
-        '../../testing/gtest.gyp:gtest',
-        '../../third_party/icu/icu.gyp:icuuc',
-      ],
-      'sources': [
-        '../../googleurl/src/gurl_unittest.cc',
-        '../../googleurl/src/url_canon_unittest.cc',
-        '../../googleurl/src/url_parse_unittest.cc',
-        '../../googleurl/src/url_test_utils.h',
-        '../../googleurl/src/url_util_unittest.cc',
-      ],
-      'defines': [
-        'FULL_FILESYSTEM_URL_SUPPORT=1',
-      ],
-      'conditions': [
-        ['os_posix==1 and OS!="mac" and OS!="ios"', {
-          'conditions': [
-            ['linux_use_tcmalloc==1', {
-              'dependencies': [
-                '../../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        }],
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [4267, ],
     },
   ],
 }
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ff515d6..61f08cd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -26,7 +26,6 @@
         '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',
@@ -55,6 +54,7 @@
         '../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 a239e25..32af5cb 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -44,11 +44,10 @@
         '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',
@@ -76,20 +75,21 @@
         '../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 c302f55..c1fa3b2 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -25,7 +25,6 @@
         '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',
@@ -42,6 +41,7 @@
         '../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 cd7297d..f8c9c30 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -30,9 +30,8 @@
         'safe_browsing_report_proto',
         'feedback_proto',
         'variations_seed_proto',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../components/components.gyp:autofill_risk_proto',
         '../components/components.gyp:auto_login_parser',
+        '../components/components.gyp:autofill_risk_proto',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
@@ -52,6 +51,7 @@
         '../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 a22d68e..cb3a709 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 236089f..010d9e2 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -32,7 +32,6 @@
         '<(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',
@@ -49,6 +48,7 @@
         '<(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 ba04c73..ea785a5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -499,7 +499,6 @@
         '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',
@@ -507,6 +506,7 @@
         '../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.
-                'browser_tests',
+                '../content/content.gyp:content_browsertests',
                 '../courgette/courgette.gyp:courgette_unittests',
                 '../crypto/crypto.gyp:crypto_unittests',
-                'chromedriver_unittests',
-                '../build/temp_gyp/googleurl.gyp:googleurl_unittests',
-                'gpu_tests',
                 '../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',
+                'gpu_tests',
                 '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': [
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index ddf2fe2..52a4b4fb 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -214,22 +214,22 @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:test_support_base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../chrome/chrome.gyp:common',
-        '../chrome/chrome.gyp:utility',
         '../chrome/chrome.gyp:browser',
+        '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:test_support_common',
+        '../chrome/chrome.gyp:utility',
         '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib',
         '../content/content.gyp:content_gpu',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
         '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy',
+        '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
         '../third_party/libxslt/libxslt.gyp:libxslt',
+        '../url/url.gyp:url',
         'chrome_frame_ie',
         'chrome_frame_strings',
         'chrome_frame_utils',
@@ -328,9 +328,8 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:browser',
+        '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:image_pre_reader',
         '../chrome/chrome.gyp:test_support_common',
@@ -341,6 +340,7 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/libxslt/libxslt.gyp:libxslt',
+        '../url/url.gyp:url',
         'chrome_frame_ie',
         'chrome_frame_strings',
         'chrome_frame_utils',
@@ -562,13 +562,13 @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:test_support_base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chrome/chrome.gyp:test_support_common',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+        '../url/url.gyp:url',
         'chrome_frame_ie',
         'chrome_frame_strings',
         'chrome_tab_idl',
@@ -682,14 +682,14 @@
         'chrome_frame_utils',
         'chrome_tab_idl',
         'locales/locales.gyp:*',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../content/content.gyp:content_common',
         '../net/net.gyp:net',
-        '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/bzip2/bzip2.gyp:bzip2',
+        '../third_party/libxml/libxml.gyp:libxml',
+        '../url/url.gyp:url',
         '../webkit/support/webkit_support.gyp:user_agent',
       ],
       'sources': [
@@ -885,11 +885,11 @@
         'chrome_frame_launcher.gyp:chrome_frame_helper',
         'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
         'locales/locales.gyp:*',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chrome/chrome.gyp:chrome',
         '../chrome/chrome.gyp:chrome_dll',
         '../chrome/chrome.gyp:chrome_version_resources',
         '../chrome/chrome.gyp:common',
+        '../url/url.gyp:url',
       ],
       'defines': [
         '_WINDLL',
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 471ce74..5626c28 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -54,11 +54,11 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/google_apis/google_apis.gyp:google_apis',
         '<(DEPTH)/ipc/ipc.gyp:ipc',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/printing/printing.gyp:printing',
+        '<(DEPTH)/url/url.gyp:url',
         'service_resources',
       ],
       'conditions': [
diff --git a/components/autofill.gypi b/components/autofill.gypi
index 00f31c0..e411aa3 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -44,11 +44,11 @@
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../content/content.gyp:content_common',
             '../ipc/ipc.gyp:ipc',
             '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
             '../ui/ui.gyp:ui',
+            '../url/url.gyp:url',
           ],
           'conditions': [
             ['OS == "android"', {
@@ -108,7 +108,6 @@
             'webdata_common',
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../content/content.gyp:content_browser',
             '../content/content.gyp:content_common',
             '../ipc/ipc.gyp:ipc',
@@ -119,6 +118,7 @@
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
             '../ui/ui.gyp:ui',
+            '../url/url.gyp:url',
             '../webkit/support/webkit_support.gyp:webkit_resources',
 
             # For grip/generated_resources.h and grit/chromium_strings.h
diff --git a/components/visitedlink.gypi b/components/visitedlink.gypi
index ddaa20f..9e380b2 100644
--- a/components/visitedlink.gypi
+++ b/components/visitedlink.gypi
@@ -10,8 +10,8 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../content/content.gyp:content_common',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../ipc/ipc.gyp:ipc',
+        '../url/url.gyp:url',
       ],
       'sources': [
         'visitedlink/common/visitedlink_common.cc',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 4bbba88..b7885f0 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -5,7 +5,6 @@
 {
   'dependencies': [
     '../base/base.gyp:base',
-    '../build/temp_gyp/googleurl.gyp:googleurl',
     '../components/tracing.gyp:tracing',
     '../media/media.gyp:media',
     '../net/net.gyp:net',
@@ -13,6 +12,7 @@
     '../third_party/icu/icu.gyp:icuuc',
     '../ui/ui.gyp:shell_dialogs',
     '../ui/ui.gyp:ui',
+    '../url/url.gyp:url',
     '../webkit/support/webkit_support.gyp:user_agent',
   ],
   'include_dirs': [
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index b245dd3..53db47b 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -41,7 +41,6 @@
         'content_resources.gyp:content_resources',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
@@ -49,6 +48,7 @@
         '../skia/skia.gyp:skia',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
+        '../url/url.gyp:url',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/support/webkit_support.gyp:webkit_resources',
         '../webkit/support/webkit_support.gyp:webkit_support',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index be5392c..afd793b 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -9,16 +9,16 @@
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        'content_app',
-        'content_browser',
-        'content_common',
         '../media/media.gyp:media',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui_test_support',
+        '../url/url.gyp:url',
+        'content_app',
+        'content_browser',
+        'content_common',
       ],
       'include_dirs': [
         '..',
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index cb01632..d3789dc 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -105,10 +105,10 @@
           ],
           'dependencies': [
             '../base/base.gyp:base',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../net/net.gyp:net',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../url/url.gyp:url',
             'jingle_glue',
           ],
           'export_dependent_settings': [
diff --git a/media/media.gyp b/media/media.gyp
index d76a988..9868dec 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -46,11 +46,11 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../skia/skia.gyp:skia',
         '../third_party/opus/opus.gyp:opus',
         '../ui/ui.gyp:ui',
+        '../url/url.gyp:url',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
diff --git a/net/net.gyp b/net/net.gyp
index ed87f84..3f96ec1 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -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': [
@@ -1386,11 +1386,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',
       ],
@@ -1971,7 +1971,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_perf',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
+        '../url/url.gyp:url',
         '../testing/gtest.gyp:gtest',
         'net',
         'net_test_support',
@@ -2010,8 +2010,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': [
@@ -2203,7 +2203,7 @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url',
             '../v8/tools/gyp/v8.gyp:v8',
             'net'
           ],
@@ -2274,8 +2274,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',
           ],
@@ -2291,7 +2291,7 @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url',
             'net',
           ],
           'sources': [
@@ -2328,7 +2328,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url',
             'net',
           ],
           'sources': [
@@ -2391,7 +2391,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url',
           ],
           'sources': [
             'tools/tld_cleanup/tld_cleanup.cc',
@@ -2484,8 +2484,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',
           ],
diff --git a/net/tools/tld_cleanup/tld_cleanup.gyp b/net/tools/tld_cleanup/tld_cleanup.gyp
index 245df98..1d4a484 100644
--- a/net/tools/tld_cleanup/tld_cleanup.gyp
+++ b/net/tools/tld_cleanup/tld_cleanup.gyp
@@ -12,7 +12,7 @@
       'type': 'executable',
       'dependencies': [
         '../../../base/base.gyp:base',
-        '../../../build/temp_gyp/googleurl.gyp:googleurl',
+        '../../../url/url.gyp:url',
       ],
       'sources': [
         'tld_cleanup.cc',
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index 6d75638..3f73728 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -46,13 +46,13 @@
         '../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',
         '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
         '../gpu/gpu.gyp:command_buffer_client',
         '../gpu/gpu.gyp:gles2_implementation',
         '../media/media.gyp:shared_memory_support',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icuuc',
+        '../url/url.gyp:url',
         # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/surface/surface.gyp:surface',
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 8490a03..0587460 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -14,11 +14,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',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/ui.gyp:ui',
+        '../url/url.gyp:url',
       ],
       'defines': [
         'PRINTING_IMPLEMENTATION',
diff --git a/rlz/rlz.gyp b/rlz/rlz.gyp
index b36c082..011f4e6 100644
--- a/rlz/rlz.gyp
+++ b/rlz/rlz.gyp
@@ -83,8 +83,8 @@
             ],
           },
           'dependencies': [
-            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../net/net.gyp:net',
+            '../url/url.gyp:url',
           ],
         }, {
           'defines': [
diff --git a/sync/sync_core.gypi b/sync/sync_core.gypi
index d9eb244..65a01b8 100644
--- a/sync/sync_core.gypi
+++ b/sync/sync_core.gypi
@@ -12,11 +12,11 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../base/base.gyp:base_i18n',
-    '../build/temp_gyp/googleurl.gyp:googleurl',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
     '../sql/sql.gyp:sql',
+    '../url/url.gyp:url',
   ],
   'conditions': [
     ['OS=="linux" and chromeos==1', {
diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi
index 04c36a6..a5d5d5a 100644
--- a/sync/sync_internal_api.gypi
+++ b/sync/sync_internal_api.gypi
@@ -11,8 +11,8 @@
   ],
   'dependencies': [
     '../base/base.gyp:base',
-    '../build/temp_gyp/googleurl.gyp:googleurl',
     '../net/net.gyp:net',
+    '../url/url.gyp:url',
   ],
   'sources': [
     'internal_api/base_node.cc',
diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp
index a15136e..b9dc7b9 100644
--- a/ui/message_center/message_center.gyp
+++ b/ui/message_center/message_center.gyp
@@ -14,8 +14,8 @@
         '../../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',
         '../../skia/skia.gyp:skia',
+        '../../url/url.gyp:url',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../ui.gyp:ui',
diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp
index 216d198..10df891 100644
--- a/ui/oak/oak.gyp
+++ b/ui/oak/oak.gyp
@@ -14,8 +14,8 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
-        '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../skia/skia.gyp:skia',
+        '../../url/url.gyp:url',
         '../aura/aura.gyp:aura',
         '../compositor/compositor.gyp:compositor',
         '../ui.gyp:ui',
diff --git a/ui/ui.gyp b/ui/ui.gyp
index cf4704a..771be0b 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -19,13 +19,13 @@
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/zlib/zlib.gyp:zlib',
+        '../url/url.gyp:url',
         'base/strings/ui_strings.gyp:ui_strings',
         'ui_resources',
       ],
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 114ad63..b09c359 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -58,13 +58,13 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
+        '../url/url.gyp:url',
         'run_ui_unittests',
         'shell_dialogs',
         'ui',
diff --git a/ui/views/controls/webview/webview.gyp b/ui/views/controls/webview/webview.gyp
index cfa717d..68bd84d 100644
--- a/ui/views/controls/webview/webview.gyp
+++ b/ui/views/controls/webview/webview.gyp
@@ -14,9 +14,9 @@
         '../../../../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',
         '../../../../content/content.gyp:content',
         '../../../../skia/skia.gyp:skia',
+        '../../../../url/url.gyp:url',
         '../../../ui.gyp:ui',
         '../../../web_dialogs/web_dialogs.gyp:web_dialogs',
         '../../views.gyp:views',
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 315b382..3af10e1 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -24,10 +24,10 @@
         '../../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',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
+        '../../url/url.gyp:url',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../native_theme/native_theme.gyp:native_theme',
@@ -648,12 +648,12 @@
         #                 factored out. (for some reason it pulls in a bunch
         #                 unrelated things like v8, sqlite nss...).
         '../../chrome/chrome_resources.gyp:packed_resources',
-        '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../skia/skia.gyp:skia',
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
+        '../../url/url.gyp:url',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
@@ -862,12 +862,12 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
-        '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../content/content.gyp:content',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
+        '../../url/url.gyp:url',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'controls/webview/webview.gyp:webview',
diff --git a/url/url.gyp b/url/url.gyp
index 6247089..2359d8f 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -72,7 +72,7 @@
       'msvs_disabled_warnings': [4267, ],
     },
     {
-      'target_name': 'url_unittests',
+      'target_name': 'googleurl_unittests',
       'type': 'executable',
       'dependencies': [
         'url',
diff --git a/webkit/base/webkit_base.gypi b/webkit/base/webkit_base.gypi
index c0c43a3..c62aef9 100644
--- a/webkit/base/webkit_base.gypi
+++ b/webkit/base/webkit_base.gypi
@@ -10,8 +10,8 @@
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/url/url.gyp:url',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'defines': ['WEBKIT_BASE_IMPLEMENTATION'],
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index fb29dce..4e4654c 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -76,7 +76,6 @@
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
         '<(DEPTH)/media/media.gyp:media',
@@ -93,6 +92,7 @@
         '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/url/url.gyp:url',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index 0d809ae..803b75d 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -29,11 +29,11 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/sql/sql.gyp:sql',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(DEPTH)/url/url.gyp:url',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index f5e10ec..803e8c2 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -53,7 +53,7 @@
             'chromium_code': 1,
           },
           'dependencies': [
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url',
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/base/base.gyp:base_i18n',
             '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -361,7 +361,7 @@
             'chromium_code': 1,
           },
           'dependencies': [
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url',
             'test_shell_common',
             '<(DEPTH)/base/base.gyp:test_support_base',
             '<(DEPTH)/net/net.gyp:net',
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index f1f9892..c73311e 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -52,7 +52,7 @@
           'type': 'shared_library',
           'dependencies': [
             '../../base/base.gyp:base',
-            '../../build/temp_gyp/googleurl.gyp:googleurl',
+            '../../url/url.gyp:url',
             '../../chrome/common_constants.gyp:common_constants',
             '../../crypto/crypto.gyp:crypto',
             '../../google_update/google_update.gyp:google_update',