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

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

2 files changed, 14 insertions, 102 deletions

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, ],
     },
   ],
 }