Roll DEPS for googleurl. Second try.

- Update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.

r184: Fix C++11 compilation on iOS
r185: Forward includes to url/

BUG=229660
R=thestig@chromium.org,brettw@chromium.org
TBR=darin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/15421002

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

44 files changed, 125 insertions, 173 deletions

diff --git a/DEPS b/DEPS
index 6fd958d..3b5682b 100644
--- a/DEPS
+++ b/DEPS
@@ -55,7 +55,7 @@ deps = {
     (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1182",
 
   "src/googleurl":
-    (Var("googlecode_url") % "google-url") + "/trunk@183",
+    (Var("googlecode_url") % "google-url") + "/trunk@185",
 
   "src/sdch/open-vcdiff":
     (Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
diff --git a/ash/ash.gyp b/ash/ash.gyp
index ac771353..d0ad39c 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -15,11 +15,9 @@
       'target_name': 'ash',
       'type': '<(component)',
       'dependencies': [
-        'ash_strings.gyp:ash_strings',
         '../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',
         '../cc/cc.gyp:cc',
         '../content/content.gyp:content',
         '../content/content.gyp:content_browser',
@@ -32,14 +30,16 @@
         '../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_lib',
+        'ash_strings.gyp:ash_strings',
         'ash_resources',
         'ash_wallpaper_resources',
       ],
@@ -594,20 +594,18 @@
       'target_name': 'ash_unittests',
       'type': 'executable',
       'dependencies': [
-        'ash_strings.gyp:ash_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../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/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
@@ -615,10 +613,12 @@
         '../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_lib',
+        'ash_strings.gyp:ash_strings',
         'ash',
         'ash_resources',
         'ash_test_support',
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index be5bc55..8748f79 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,66 +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_lib',
       ],
-      '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_lib',
       ],
-      '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, ],
     },
   ],
 }
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f40b401..b162342 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -26,15 +26,14 @@
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         'variations_seed_proto',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../components/components.gyp:browser_context_keyed_service',
         '../components/components.gyp:encryptor',
         '../components/components.gyp:sessions',
         '../components/components.gyp:user_prefs',
         '../components/components.gyp:visitedlink_browser',
         '../components/components.gyp:visitedlink_common',
-        '../components/components.gyp:webdata_common',
         '../components/components.gyp:web_modal',
+        '../components/components.gyp:webdata_common',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
@@ -51,8 +50,8 @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
-        '../third_party/zlib/zlib.gyp:zip',
         '../third_party/zlib/zlib.gyp:minizip',
+        '../third_party/zlib/zlib.gyp:zip',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/message_center/message_center.gyp:message_center',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 96a0b5d..a9c6f7d 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -22,10 +22,10 @@
       },
       'dependencies': [
         # TODO(tbarzic): Cleanup this list.
-        'app/policy/cloud_policy_codegen.gyp:policy',
 	'attestation_proto',
-        'browser_extensions',
+        'app/policy/cloud_policy_codegen.gyp:policy',
         'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
+        'browser_extensions',
         'cert_logger_proto',
         'chrome_resources.gyp:chrome_extra_resources',
         'chrome_resources.gyp:chrome_resources',
@@ -45,12 +45,11 @@
         'safe_browsing_report_proto',
         'variations_seed_proto',
         '../build/linux/system.gyp:dbus',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chromeos/chromeos.gyp:chromeos',
         '../chromeos/chromeos.gyp:chromeos_memory',
+        '../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/bluetooth/bluetooth.gyp:device_bluetooth',
@@ -77,20 +76,22 @@
         '../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_lib',
         '../v8/tools/gyp/v8.gyp:v8',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/support/webkit_support.gyp:glue',
         '../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 e365263..72e1a14 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/bluetooth/bluetooth.gyp:device_bluetooth',
@@ -41,6 +40,7 @@
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
+        '../url/url.gyp:url_lib',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:webkit_base',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 0bd903b..3916783 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',
diff --git a/chrome/chrome_browser_ui_views.gyp b/chrome/chrome_browser_ui_views.gyp
index a22d68e..d10536b 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_lib',
       ],
       'conditions': [
         ['use_ash==1', {
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e1e6599..bfbe953 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',
@@ -48,6 +47,7 @@
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/zlib/zlib.gyp:zip',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
       ],
       'sources': [
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 39f14e2..80964f2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -518,16 +518,7 @@
       'target_name': 'chromedriver_lib',
       'type': 'static_library',
       'dependencies': [
-        'browser',
-        'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
-        'chromedriver_support',
-        'common',
-        'test_support_ui',
-        'test_support_ui_runner',
         '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
@@ -535,6 +526,15 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
+        '../url/url.gyp:url_lib',
+        'browser',
+        'chrome',
+        'chrome_resources.gyp:chrome_resources',
+        'chrome_resources.gyp:chrome_strings',
+        'chromedriver_support',
+        'common',
+        'test_support_ui',
+        'test_support_ui_runner',
       ],
       'include_dirs': [
         '..',
@@ -769,11 +769,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_lib',
       ],
       'include_dirs': [
         '..',
@@ -1113,14 +1113,14 @@
       'target_name': 'chromedriver2_tests',
       'type': 'executable',
       'dependencies': [
-        '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_lib',
+        'chromedriver2_lib',
       ],
       'include_dirs': [
         '..,'
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 3a805c4..f7bf02a 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_lib',
         '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_lib',
         'chrome_frame_ie',
         'chrome_frame_strings',
         'chrome_frame_utils',
@@ -562,7 +562,6 @@
       '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',
@@ -570,6 +569,7 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+        '../url/url.gyp:url_lib',
         'chrome_frame_ie',
         'chrome_frame_strings',
         'chrome_tab_idl',
@@ -678,19 +678,19 @@
       'target_name': 'chrome_frame_ie',
       'type': 'static_library',
       'dependencies': [
-        'chrome_frame_common',
-        'chrome_frame_strings',
-        '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',
+        '../url/url.gyp:url_lib',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        'chrome_frame_common',
+        'chrome_frame_strings',
+        'chrome_frame_utils',
+        'chrome_tab_idl',
+        'locales/locales.gyp:*',
       ],
       'sources': [
         'bho.cc',
@@ -876,20 +876,20 @@
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
+        '../chrome/chrome.gyp:chrome',
+        '../chrome/chrome.gyp:chrome_dll',
+        '../chrome/chrome.gyp:chrome_version_resources',
+        '../chrome/chrome.gyp:common',
+        '../url/url.gyp:url_lib',
         'chrome_frame_ie',
+        'chrome_frame_launcher.gyp:chrome_frame_helper',
+        'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
+        'chrome_frame_launcher.gyp:chrome_launcher',
         'chrome_frame_strings',
         'chrome_frame_utils',
         'chrome_frame_version_resources',
         'chrome_tab_idl',
-        'chrome_frame_launcher.gyp:chrome_launcher',
-        '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',
       ],
       'defines': [
         '_WINDLL',
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 0122dbf..6270b34 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -20,10 +20,10 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../dbus/dbus.gyp:dbus',
         '../net/net.gyp:net',
         '../third_party/libxml/libxml.gyp:libxml',
+        '../url/url.gyp:url_lib',
         'ime/input_method.gyp:gencode',
         'power_manager_proto',
         'video_activity_update_proto',
@@ -301,9 +301,14 @@
       ],
       'conditions': [
         ['use_x11 == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:glib',
+          ],
           'link_settings': {
             'libraries': [
+              '-lX11',
               '-lXext',
+              '-lXi',
               '-lXrandr',
             ],
           },
@@ -438,12 +443,12 @@
         '../base/base.gyp:test_support_base',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus_test_support',
         '../net/net.gyp:net',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../url/url.gyp:url_lib',
         'chromeos_test_support',
         'power_manager_proto',
       ],
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index d1ac611..1bdc552 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_lib',
         'service_resources',
       ],
       'conditions': [
diff --git a/components/autofill.gypi b/components/autofill.gypi
index 17a331d..cc563f7 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -53,11 +53,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_lib',
           ],
           'conditions': [
             ['OS == "android"', {
@@ -121,7 +121,6 @@
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:base_prefs',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
             '../content/content.gyp:content_browser',
             '../content/content.gyp:content_common',
             '../google_apis/google_apis.gyp:google_apis',
@@ -133,6 +132,7 @@
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
             '../ui/ui.gyp:ui',
+            '../url/url.gyp:url_lib',
             '../webkit/support/webkit_support.gyp:webkit_resources',
 
             'component_resources.gyp:component_resources',
diff --git a/components/sessions.gypi b/components/sessions.gypi
index 2741a3d..ad56821 100644
--- a/components/sessions.gypi
+++ b/components/sessions.gypi
@@ -9,10 +9,10 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
         '../skia/skia.gyp:skia',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+        '../url/url.gyp:url_lib',
       ],
       'include_dirs': [
         '..',
diff --git a/components/visitedlink.gypi b/components/visitedlink.gypi
index ddaa20f..439a848 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_lib',
       ],
       'sources': [
         'visitedlink/common/visitedlink_common.cc',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 8d878dd..e0658428 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_lib',
     '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
   ],
   'include_dirs': [
diff --git a/content/content_common_child.gypi b/content/content_common_child.gypi
index c8a8c3d..6461a99 100644
--- a/content/content_common_child.gypi
+++ b/content/content_common_child.gypi
@@ -5,9 +5,9 @@
 {
   'dependencies': [
     '../base/base.gyp:base',
-    '../build/temp_gyp/googleurl.gyp:googleurl',
     '../components/tracing.gyp:tracing',
     '../ui/ui.gyp:ui',
+    '../url/url.gyp:url_lib',
   ],
   'include_dirs': [
     '..',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index e0bb675..eca6dac 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',
@@ -52,6 +51,7 @@
         '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
+        '../url/url.gyp:url_lib',
         '../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 2a7634c..81069be 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_lib',
+        'content_app',
+        'content_browser',
+        'content_common',
       ],
       'include_dirs': [
         '..',
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index cb01632..ecfd30e 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_lib',
             'jingle_glue',
           ],
           'export_dependent_settings': [
diff --git a/media/media.gyp b/media/media.gyp
index aa924b5..d3d7999 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_lib',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
diff --git a/net/net.gyp b/net/net.gyp
index 65339bf..73e171d 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -51,12 +51,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_lib',
         'net_resources',
       ],
       'sources': [
@@ -1449,11 +1449,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_lib',
         'net',
         'net_test_support',
       ],
@@ -2074,8 +2074,8 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_perf',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../testing/gtest.gyp:gtest',
+        '../url/url.gyp:url_lib',
         'net',
         'net_test_support',
       ],
@@ -2113,9 +2113,9 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
         '../testing/gtest.gyp:gtest',
+        '../url/url.gyp:url_lib',
         'net',
       ],
       'export_dependent_settings': [
@@ -2315,7 +2315,7 @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url_lib',
             '../v8/tools/gyp/v8.gyp:v8',
             'net'
           ],
@@ -2386,8 +2386,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_lib',
             'net',
             'net_with_v8',
           ],
@@ -2403,7 +2403,7 @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url_lib',
             'net',
           ],
           'sources': [
@@ -2440,7 +2440,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../url/url.gyp:url_lib',
             'net',
           ],
           'sources': [
@@ -2595,10 +2595,10 @@
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
-            '../crypto/crypto.gyp:crypto',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../crypto/crypto.gyp:crypto',
             '../third_party/openssl/openssl.gyp:openssl',
+            '../url/url.gyp:url_lib',
             '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 227022c..c698550 100644
--- a/net/tools/tld_cleanup/tld_cleanup.gyp
+++ b/net/tools/tld_cleanup/tld_cleanup.gyp
@@ -12,7 +12,7 @@
       'type': 'static_library',
       'dependencies': [
         '../../../base/base.gyp:base',
-        '../../../build/temp_gyp/googleurl.gyp:googleurl',
+        '../../../url/url.gyp:url_lib',
       ],
       'sources': [
         'tld_cleanup_util.h',
diff --git a/ppapi/ppapi_host.gypi b/ppapi/ppapi_host.gypi
index 55bc545..e65cbcd 100644
--- a/ppapi/ppapi_host.gypi
+++ b/ppapi/ppapi_host.gypi
@@ -8,15 +8,15 @@
       'target_name': 'ppapi_host',
       'type': '<(component)',
       'dependencies': [
-        'ppapi.gyp:ppapi_c',
-        'ppapi_internal.gyp:ppapi_proxy',
-        'ppapi_internal.gyp:ppapi_ipc',
-        'ppapi_internal.gyp:ppapi_shared',
         '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:shared_memory_support',
         '../ui/surface/surface.gyp:surface',
+        '../url/url.gyp:url_lib',
+        'ppapi.gyp:ppapi_c',
+        'ppapi_internal.gyp:ppapi_ipc',
+        'ppapi_internal.gyp:ppapi_proxy',
+        'ppapi_internal.gyp:ppapi_shared',
       ],
       'defines': [
         'PPAPI_HOST_IMPLEMENTATION',
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index fd82adc..29a60db 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -42,11 +42,9 @@
         'ppapi_shared_target': 1,
       },
       'dependencies': [
-        'ppapi.gyp:ppapi_c',
         '../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',
@@ -56,6 +54,8 @@
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/surface/surface.gyp:surface',
+        '../url/url.gyp:url_lib',
+        'ppapi.gyp:ppapi_c',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 2ec1209..f8bbb7b 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_lib',
       ],
       'defines': [
         'PRINTING_IMPLEMENTATION',
diff --git a/rlz/rlz.gyp b/rlz/rlz.gyp
index b36c082..c38c4ff 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_lib',
           ],
         }, {
           'defines': [
diff --git a/sync/sync_core.gypi b/sync/sync_core.gypi
index df314ce..6bda262 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_lib',
   ],
   'conditions': [
     ['OS=="linux" and chromeos==1', {
diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi
index b07762f..681f3bf 100644
--- a/sync/sync_internal_api.gypi
+++ b/sync/sync_internal_api.gypi
@@ -11,9 +11,9 @@
   ],
   'dependencies': [
     '../base/base.gyp:base',
-    '../build/temp_gyp/googleurl.gyp:googleurl',
     '../net/net.gyp:net',
     '../third_party/zlib/zlib.gyp:zlib',
+    '../url/url.gyp:url_lib',
   ],
   'sources': [
     'internal_api/base_node.cc',
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index f26ac4a..fc5f317 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -497,16 +497,16 @@
         'test/accounts_client/url_request_context_getter.h',
       ],
     },
-    
+
     # The Sync end-to-end (and associated infrastructure) tests.
     {
       'target_name': 'sync_endtoend_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../url/url.gyp:url_lib',
         'test_support_accounts_client',
       ],
       'sources': [
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index 0995fd85..1cd00ce 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -38,10 +38,10 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../content/content.gyp:content_browser',
         '../../ipc/ipc.gyp:ipc',
         '../../skia/skia.gyp:skia',
+        '../../url/url.gyp:url_lib',
         '../aura/aura.gyp:aura',
         '../compositor/compositor.gyp:compositor',
         '../ui.gyp:ui',
diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp
index 18e7c87..bf229a2 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_lib',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp
index 216d198..ac07c63 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_lib',
         '../aura/aura.gyp:aura',
         '../compositor/compositor.gyp:compositor',
         '../ui.gyp:ui',
diff --git a/ui/ui.gyp b/ui/ui.gyp
index c1c76fc..b6b1b3f 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -20,13 +20,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_lib',
         'base/strings/ui_strings.gyp:ui_strings',
         'ui_resources',
       ],
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index a66dad6..1d0069c 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_lib',
         'run_ui_unittests',
         'shell_dialogs',
         'ui',
diff --git a/ui/views/controls/webview/webview.gyp b/ui/views/controls/webview/webview.gyp
index fbe094f..25cb11a 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_lib',
         '../../../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 d0590e4..95edb9b 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_lib',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../native_theme/native_theme.gyp:native_theme',
@@ -659,12 +659,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_lib',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
@@ -879,12 +879,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_lib',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'controls/webview/webview.gyp:webview',
diff --git a/webkit/base/webkit_base.gypi b/webkit/base/webkit_base.gypi
index 52521bdf0..bb5dfd2f 100644
--- a/webkit/base/webkit_base.gypi
+++ b/webkit/base/webkit_base.gypi
@@ -10,9 +10,9 @@
       '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)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/url/url.gyp:url_lib',
       ],
       'defines': ['WEBKIT_BASE_IMPLEMENTATION'],
       'sources': [
diff --git a/webkit/common/user_agent/webkit_user_agent.gyp b/webkit/common/user_agent/webkit_user_agent.gyp
index f94fe19..f1f0088 100644
--- a/webkit/common/user_agent/webkit_user_agent.gyp
+++ b/webkit/common/user_agent/webkit_user_agent.gyp
@@ -16,6 +16,7 @@
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
       ],
       'sources': [
         'user_agent.cc',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index cce64c3..7c993b5 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -64,15 +64,15 @@
         'WEBKIT_GLUE_IMPLEMENTATION',
       ],
       'dependencies': [
-        '<(DEPTH)/base/base.gyp:base_i18n',
         '<(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)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/url/url.gyp:url_lib',
       ],
 
       'include_dirs': [
@@ -166,7 +166,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)/net/net.gyp:net',
@@ -180,6 +179,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_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi
index cf17901..5c1ef0e 100644
--- a/webkit/plugins/webkit_plugins.gypi
+++ b/webkit/plugins/webkit_plugins.gypi
@@ -87,7 +87,6 @@
         '<(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)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
         '<(DEPTH)/media/media.gyp:media',
@@ -97,9 +96,11 @@
         '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
         '<(DEPTH)/printing/printing.gyp:printing',
         '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index 0fb1474..0b8c8f8 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -21,12 +21,12 @@
         '<(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/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
       ],
       'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index 623b000..bad7c79 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -52,13 +52,13 @@
           'type': 'shared_library',
           'dependencies': [
             '../../base/base.gyp:base',
-            '../../build/temp_gyp/googleurl.gyp:googleurl',
             '../../chrome/common_constants.gyp:common_constants',
             '../../crypto/crypto.gyp:crypto',
             '../../google_update/google_update.gyp:google_update',
             '../../ipc/ipc.gyp:ipc',
             '../../sandbox/sandbox.gyp:sandbox',
             '../../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages',
+            '../../url/url.gyp:url_lib',
             '../win8.gyp:check_sdk_patch',
             'metro_driver_version_resources',
           ],
@@ -77,8 +77,8 @@
                 'chrome_app_view_ash.h',
                 'direct3d_helper.cc',
                 'direct3d_helper.h',
-                'file_picker_ash.h',
                 'file_picker_ash.cc',
+                'file_picker_ash.h',
               ],
             }, {  # use_aura!=1
               'sources': [
@@ -90,16 +90,16 @@
                 '../delegate_execute/chrome_util.h',
                 'devices_handler.cc',
                 'devices_handler.h',
-                'file_picker.h',
                 'file_picker.cc',
+                'file_picker.h',
                 'metro_dialog_box.cc',
                 'metro_dialog_box.h',
-                'print_handler.cc',
-                'print_handler.h',
                 'print_document_source.cc',
                 'print_document_source.h',
-                'secondary_tile.h',
+                'print_handler.cc',
+                'print_handler.h',
                 'secondary_tile.cc',
+                'secondary_tile.h',
                 'settings_handler.cc',
                 'settings_handler.h',
                 'toast_notification_handler.cc',