net: Migrate from googleurl/ includes to url/ ones.

BUG=229660 R=eroman@chromium.org TBR=eroman@chromium.org Review URL: https://chromiumcodereview.appspot.com/6362186595172352 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211347 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Jul 12, 2013 · f89276a · f89276a
1 parent 69cff8e
commit f89276a
Show file tree

Hide file tree

Showing 115 changed files with 131 additions and 131 deletions.
diff --git a/net/android/gurl_utils.cc b/net/android/gurl_utils.cc
@@ -5,8 +5,8 @@
 #include "net/android/gurl_utils.h"
 
 #include "base/android/jni_string.h"
-#include "googleurl/src/gurl.h"
 #include "jni/GURLUtils_jni.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/data_url.cc b/net/base/data_url.cc
@@ -12,8 +12,8 @@
 #include "base/basictypes.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/data_url_unittest.cc b/net/base/data_url_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/data_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace {
 

diff --git a/net/base/escape.cc b/net/base/escape.cc
@@ -74,8 +74,8 @@ std::string Escape(const std::string& text, const Charmap& charmap,
 // you could get different behavior if you copy and paste the URL, or press
 // enter in the URL bar. The list of characters that fall into this category
 // are the ones labeled PASS (allow either escaped or unescaped) in the big
-// lookup table at the top of googleurl/src/url_canon_path.cc.  Also, characters
-// that have CHAR_QUERY set in googleurl/src/url_canon_internal.cc but are not
+// lookup table at the top of url/url_canon_path.cc.  Also, characters
+// that have CHAR_QUERY set in url/url_canon_internal.cc but are not
 // allowed in query strings according to http://www.ietf.org/rfc/rfc3261.txt are
 // not unescaped, to avoid turning a valid url according to spec into an
 // invalid one.

diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc
@@ -8,8 +8,8 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/ip_endpoint.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/keygen_handler.h b/net/base/keygen_handler.h
@@ -9,8 +9,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_export.h"
+#include "url/gurl.h"
 
 #if defined(USE_NSS)
 #include "crypto/crypto_module_blocking_password_delegate.h"

diff --git a/net/base/mime_sniffer.cc b/net/base/mime_sniffer.cc
@@ -100,8 +100,8 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/mime_sniffer_unittest.cc b/net/base/mime_sniffer_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/mime_sniffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/mock_filter_context.h b/net/base/mock_filter_context.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "googleurl/src/gurl.h"
 #include "net/base/filter.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
@@ -52,11 +52,11 @@
 #include "base/sys_byteorder.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_canon.h"
-#include "googleurl/src/url_canon_ip.h"
-#include "googleurl/src/url_parse.h"
 #include "grit/net_resources.h"
+#include "url/gurl.h"
+#include "url/url_canon.h"
+#include "url/url_canon_ip.h"
+#include "url/url_parse.h"
 #if defined(OS_ANDROID)
 #include "net/android/network_library.h"
 #endif

diff --git a/net/base/net_util_posix.cc b/net/base/net_util_posix.cc
@@ -12,10 +12,10 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
+#include "url/gurl.h"
 
 #if !defined(OS_ANDROID)
 #include <ifaddrs.h>

diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
@@ -18,8 +18,8 @@
 #include "base/sys_byteorder.h"
 #include "base/test/test_file_util.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc
@@ -18,10 +18,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_handle.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
@@ -7,11 +7,11 @@
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier_factory.h"
 #include "net/dns/dns_config_service.h"
 #include "net/url_request/url_request.h"
+#include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "net/base/network_change_notifier_win.h"

diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc
@@ -48,10 +48,10 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_parse.h"
 #include "net/base/net_module.h"
 #include "net/base/net_util.h"
+#include "url/gurl.h"
+#include "url/url_parse.h"
 
 #include "effective_tld_names.cc"
 

diff --git a/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 #include "effective_tld_names_unittest1.cc"
 static const char* const Perfect_Hash_Test1_stringpool = stringpool1;

diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h
@@ -29,8 +29,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_export.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/static_cookie_policy.cc b/net/base/static_cookie_policy.cc
@@ -5,9 +5,9 @@
 #include "net/base/static_cookie_policy.h"
 
 #include "base/logging.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/static_cookie_policy_unittest.cc b/net/base/static_cookie_policy_unittest.cc
@@ -5,7 +5,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/url_util.cc b/net/base/url_util.cc
@@ -5,8 +5,8 @@
 #include "net/base/url_util.h"
 
 #include "base/strings/string_piece.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/base/url_util_unittest.cc b/net/base/url_util_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "net/base/url_util.h"
 
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace net {
 namespace {

diff --git a/net/cert/cert_verify_proc.cc b/net/cert/cert_verify_proc.cc
@@ -7,7 +7,6 @@
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
 #include "build/build_config.h"
-#include "googleurl/src/url_canon.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -16,6 +15,7 @@
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/crl_set.h"
 #include "net/cert/x509_certificate.h"
+#include "url/url_canon.h"
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #include "net/cert/cert_verify_proc_nss.h"

diff --git a/net/cert/x509_certificate.cc b/net/cert/x509_certificate.cc
@@ -22,10 +22,10 @@
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
-#include "googleurl/src/url_canon.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cert/pem_tokenizer.h"
+#include "url/url_canon.h"
 
 namespace net {
 

diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
@@ -48,10 +48,10 @@
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_canon.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
+#include "url/gurl.h"
+#include "url/url_canon.h"
 
 using base::Time;
 using base::TimeDelta;

diff --git a/net/cookies/canonical_cookie_unittest.cc b/net/cookies/canonical_cookie_unittest.cc
@@ -5,10 +5,10 @@
 #include "net/cookies/canonical_cookie.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "googleurl/src/gurl.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
@@ -58,11 +58,11 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
+#include "url/gurl.h"
 
 using base::Time;
 using base::TimeDelta;

diff --git a/net/cookies/cookie_monster_perftest.cc b/net/cookies/cookie_monster_perftest.cc
@@ -9,12 +9,12 @@
 #include "base/perftimer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "googleurl/src/gurl.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_monster_store_test.h"
 #include "net/cookies/parsed_cookie.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc
@@ -8,11 +8,11 @@
 #include "base/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace net {
 LoadedCallbackTask::LoadedCallbackTask(LoadedCallback loaded_callback,

diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
@@ -22,7 +22,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_monster.h"
@@ -31,6 +30,7 @@
 #include "net/cookies/parsed_cookie.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
@@ -9,11 +9,11 @@
 #include "base/message_loop.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/threading/thread.h"
-#include "googleurl/src/gurl.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_store_test_callbacks.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 // This file declares unittest templates that can be used to test common
 // behavior of any CookieStore implementation.

diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc
@@ -11,9 +11,9 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "url/gurl.h"
 
 namespace net {
 namespace cookie_util {

diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc
@@ -25,12 +25,12 @@
 #include "base/win/object_watcher.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
-#include "googleurl/src/url_canon.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/dns_hosts.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/serial_worker.h"
+#include "url/url_canon.h"
 
 #pragma comment(lib, "iphlpapi.lib")
 

diff --git a/net/ftp/ftp_auth_cache.cc b/net/ftp/ftp_auth_cache.cc
@@ -5,7 +5,7 @@
 #include "net/ftp/ftp_auth_cache.h"
 
 #include "base/logging.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace net {
 

diff --git a/net/ftp/ftp_auth_cache.h b/net/ftp/ftp_auth_cache.h
@@ -7,9 +7,9 @@
 
 #include <list>
 
-#include "googleurl/src/gurl.h"
 #include "net/base/auth.h"
 #include "net/base/net_export.h"
+#include "url/gurl.h"
 
 namespace net {