commit a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf
author Torne (Richard Coles) <torne@google.com> Wed May 15 11:34:50 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 15 11:34:50 2013 +0100
tree 2fc96923f36ddec68fee218d79dd407c28fa46f8
parent 770489ea635fbf896c1ace4db0d08d6981a2db8b

Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3

net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp
index 02f8dda..656a2b4 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1316,7 +1316,6 @@
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
-              'tld_cleanup',
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
@@ -1784,6 +1783,7 @@
         'tools/dump_cache/url_utilities.h',
         'tools/dump_cache/url_utilities.cc',
         'tools/dump_cache/url_utilities_unittest.cc',
+        'tools/tld_cleanup/tld_cleanup_util_unittest.cc',
         'udp/udp_socket_unittest.cc',
         'url_request/url_fetcher_impl_unittest.cc',
         'url_request/url_request_context_builder_unittest.cc',
@@ -2092,6 +2092,7 @@
         '../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',
         'net',
       ],
@@ -2480,7 +2481,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
-            '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
           ],
           'sources': [
             'tools/tld_cleanup/tld_cleanup.cc',