diff options
115 files changed, 131 insertions, 131 deletions
diff --git a/net/android/gurl_utils.cc b/net/android/gurl_utils.cc index d6442d2..c8cb1e4 100644 --- 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 index 2ac0ef1..e7b46cd 100644 --- 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 index a4ea6aa..2d8e817 100644 --- 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 index bbd4d52..23b4eeb 100644 --- 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 index 5b9f1ba..bc23a9a 100644 --- 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 index a6e822c..4895dac 100644 --- 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 index 76a4a5b..c582cff 100644 --- 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 index 5de73fb..e4f2d5c 100644 --- 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 index d35fc85..592be55 100644 --- 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 index 5f08d1f..41a4c21 100644 --- 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 index fbb8aa3..904d802 100644 --- 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 index fbf069f..bea0339 100644 --- 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 index 36d5d2c..930460d 100644 --- 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 index 491de3f..a6335d0 100644 --- 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 index 35ca80d..56d5ed9 100644 --- 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 index 00d8f7b..d1d96f9 100644 --- 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 index f275c8f..4f45966 100644 --- 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 index f7ac065..c1acb66 100644 --- 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 index 3d4e046..eb1d40b 100644 --- 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 index 39d6ec4..7c0722a 100644 --- 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 index 8d1efde..f6508fc 100644 --- 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 index 9022651..3bd3735 100644 --- 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 index b6f9cd6..97b00c3 100644 --- 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 index 91bdaeb..15b77c7 100644 --- 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 index a9eda31..26e4e12 100644 --- 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 index a17d5e7..ae281d2 100644 --- 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 index 3cb4016..1af5aa1 100644 --- 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 index 7a1b8ad..82300f3 100644 --- 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 index 21b3fb5..ea45943 100644 --- 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 index a4a05e4..643b53a 100644 --- 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 index d4637fa..a4200f5 100644 --- 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 index 3769b53..6d12155 100644 --- 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 index fc28922..370cee5 100644 --- 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 index d40b904..526b358 100644 --- 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 { diff --git a/net/ftp/ftp_auth_cache_unittest.cc b/net/ftp/ftp_auth_cache_unittest.cc index 287e85ee..153d08b 100644 --- a/net/ftp/ftp_auth_cache_unittest.cc +++ b/net/ftp/ftp_auth_cache_unittest.cc @@ -7,9 +7,9 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using net::FtpAuthCache; diff --git a/net/ftp/ftp_request_info.h b/net/ftp/ftp_request_info.h index b30610e..be7702f 100644 --- a/net/ftp/ftp_request_info.h +++ b/net/ftp/ftp_request_info.h @@ -5,7 +5,7 @@ #ifndef NET_FTP_FTP_REQUEST_INFO_H_ #define NET_FTP_FTP_REQUEST_INFO_H_ -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h index 3880dbf..1d6f2d2 100644 --- a/net/http/http_auth_cache.h +++ b/net/http/http_auth_cache.h @@ -10,9 +10,9 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" #include "net/http/http_auth.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_auth_controller.h b/net/http/http_auth_controller.h index efcab5e..5d5b469 100644 --- a/net/http/http_auth_controller.h +++ b/net/http/http_auth_controller.h @@ -12,11 +12,11 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/http/http_auth.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_auth_filter.cc b/net/http/http_auth_filter.cc index 11313ab..53d81ea 100644 --- a/net/http/http_auth_filter.cc +++ b/net/http/http_auth_filter.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 "net/http/http_auth_filter.h" #include "base/strings/string_util.h" -#include "googleurl/src/gurl.h" +#include "net/http/http_auth_filter.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_auth_filter_unittest.cc b/net/http/http_auth_filter_unittest.cc index e6891dd..25723c1 100644 --- a/net/http/http_auth_filter_unittest.cc +++ b/net/http/http_auth_filter_unittest.cc @@ -6,9 +6,9 @@ #include "base/memory/scoped_ptr.h" -#include "googleurl/src/gurl.h" #include "net/http/http_auth_filter.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_auth_handler_mock.h b/net/http/http_auth_handler_mock.h index ee2a92c..7cc441a 100644 --- a/net/http/http_auth_handler_mock.h +++ b/net/http/http_auth_handler_mock.h @@ -9,9 +9,9 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "googleurl/src/gurl.h" #include "net/http/http_auth_handler.h" #include "net/http/http_auth_handler_factory.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 55cfb2e..f0e09fa 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -21,7 +21,6 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "build/build_config.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" @@ -59,6 +58,7 @@ #include "net/spdy/spdy_session_pool.h" #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_connection_status_flags.h" +#include "url/gurl.h" using base::Time; diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc index 81f6ff4..7037616 100644 --- a/net/http/http_proxy_client_socket.cc +++ b/net/http/http_proxy_client_socket.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" @@ -21,6 +20,7 @@ #include "net/http/http_stream_parser.h" #include "net/http/proxy_connect_redirect_http_stream.h" #include "net/socket/client_socket_handle.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index 3e93008..5249f5b 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/time/time.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/http/http_network_session.h" @@ -25,6 +24,7 @@ #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_stream.h" #include "net/ssl/ssl_cert_request_info.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_request_info.h b/net/http/http_request_info.h index 5b94427..607bba5 100644 --- a/net/http/http_request_info.h +++ b/net/http/http_request_info.h @@ -8,10 +8,10 @@ #include <string> #include "base/basictypes.h" -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" #include "net/base/privacy_mode.h" #include "net/http/http_request_headers.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc index 89ba518..6d2e140 100644 --- a/net/http/http_stream_factory.cc +++ b/net/http/http_stream_factory.cc @@ -7,9 +7,9 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "googleurl/src/gurl.h" #include "net/base/host_mapping_rules.h" #include "net/base/host_port_pair.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc index 7ee16d8..c54d92e 100644 --- a/net/http/http_stream_factory_impl.cc +++ b/net/http/http_stream_factory_impl.cc @@ -8,7 +8,6 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "googleurl/src/gurl.h" #include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/http/http_network_session.h" @@ -19,6 +18,7 @@ #include "net/http/http_stream_factory_impl_job.h" #include "net/http/http_stream_factory_impl_request.h" #include "net/spdy/spdy_http_stream.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_stream_factory_impl_request.h b/net/http/http_stream_factory_impl_request.h index ff4f8af..e877683 100644 --- a/net/http/http_stream_factory_impl_request.h +++ b/net/http/http_stream_factory_impl_request.h @@ -7,11 +7,11 @@ #include <set> #include "base/memory/scoped_ptr.h" -#include "googleurl/src/gurl.h" #include "net/base/net_log.h" #include "net/http/http_stream_factory_impl.h" #include "net/socket/ssl_client_socket.h" #include "net/spdy/spdy_session_key.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index 580f434..d530c2d 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -10,7 +10,6 @@ #include "base/memory/ref_counted.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" -#include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" @@ -23,6 +22,7 @@ #include "net/socket/client_socket_handle.h" #include "net/socket/socket_test_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/http_util.h b/net/http/http_util.h index 9fe199b..ae65146 100644 --- a/net/http/http_util.h +++ b/net/http/http_util.h @@ -10,10 +10,10 @@ #include "base/memory/ref_counted.h" #include "base/strings/string_tokenizer.h" -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" #include "net/http/http_byte_range.h" #include "net/http/http_version.h" +#include "url/gurl.h" // This is a macro to support extending this string literal at compile time. // Please excuse me polluting your global namespace! diff --git a/net/http/proxy_client_socket.cc b/net/http/proxy_client_socket.cc index ed8b3c9..dcfae03 100644 --- a/net/http/proxy_client_socket.cc +++ b/net/http/proxy_client_socket.cc @@ -6,7 +6,6 @@ #include "base/metrics/histogram.h" #include "base/strings/stringprintf.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" @@ -14,6 +13,7 @@ #include "net/http/http_request_info.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc index f2282ed..d238e99 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -29,12 +29,12 @@ #include "base/time/time.h" #include "base/values.h" #include "crypto/sha2.h" -#include "googleurl/src/gurl.h" #include "net/base/dns_util.h" #include "net/cert/x509_cert_types.h" #include "net/cert/x509_certificate.h" #include "net/http/http_security_headers.h" #include "net/ssl/ssl_info.h" +#include "url/gurl.h" #if defined(USE_OPENSSL) #include "crypto/openssl_util.h" diff --git a/net/http/url_security_manager_unittest.cc b/net/http/url_security_manager_unittest.cc index d1e7623..cf072e5 100644 --- a/net/http/url_security_manager_unittest.cc +++ b/net/http/url_security_manager_unittest.cc @@ -5,10 +5,10 @@ #include "net/http/url_security_manager.h" #include "base/basictypes.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/http/http_auth_filter.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/http/url_security_manager_win.cc b/net/http/url_security_manager_win.cc index 6d43db0..cb3c66e 100644 --- a/net/http/url_security_manager_win.cc +++ b/net/http/url_security_manager_win.cc @@ -10,8 +10,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_comptr.h" -#include "googleurl/src/gurl.h" #include "net/http/http_auth_filter.h" +#include "url/gurl.h" // The Windows implementation of URLSecurityManager uses WinINet/IE's // URL security zone manager. See the MSDN page "URL Security Zones" at diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index 5fe7b08..84f1b6f 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -29,7 +29,6 @@ #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" @@ -39,6 +38,7 @@ #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h index 564a8b8..fadf234 100644 --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h @@ -13,9 +13,9 @@ #include "base/strings/string16.h" #include "base/threading/non_thread_safe.h" #include "base/timer/timer.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/dhcp_proxy_script_fetcher.h b/net/proxy/dhcp_proxy_script_fetcher.h index 04ead28..0ec2ed4 100644 --- a/net/proxy/dhcp_proxy_script_fetcher.h +++ b/net/proxy/dhcp_proxy_script_fetcher.h @@ -8,10 +8,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" #include "net/proxy/proxy_script_fetcher.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h index 33c67a5..3864d53 100644 --- a/net/proxy/mock_proxy_resolver.h +++ b/net/proxy/mock_proxy_resolver.h @@ -8,9 +8,9 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_resolver.h" +#include "url/gurl.h" namespace base { class MessageLoop; diff --git a/net/proxy/mock_proxy_script_fetcher.h b/net/proxy/mock_proxy_script_fetcher.h index 222cbf6..81e221f 100644 --- a/net/proxy/mock_proxy_script_fetcher.h +++ b/net/proxy/mock_proxy_script_fetcher.h @@ -6,8 +6,8 @@ #define NET_PROXY_MOCK_PROXY_SCRIPT_FETCHER_H_ #include "base/compiler_specific.h" -#include "googleurl/src/gurl.h" #include "net/proxy/proxy_script_fetcher.h" +#include "url/gurl.h" #include <string> diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc index 4cf4241..6abcdda 100644 --- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc @@ -11,13 +11,13 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/test_completion_callback.h" #include "net/proxy/proxy_info.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/proxy_bypass_rules.h b/net/proxy/proxy_bypass_rules.h index cfaacf0..6afeeee 100644 --- a/net/proxy/proxy_bypass_rules.h +++ b/net/proxy/proxy_bypass_rules.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h index 77318b6..e558174 100644 --- a/net/proxy/proxy_config.h +++ b/net/proxy/proxy_config.h @@ -7,12 +7,12 @@ #include <string> -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" #include "net/proxy/proxy_bypass_rules.h" #include "net/proxy/proxy_config_source.h" #include "net/proxy/proxy_list.h" #include "net/proxy/proxy_server.h" +#include "url/gurl.h" namespace base { class Value; diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index e763445..41bef8a 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -16,12 +16,12 @@ #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/sequenced_task_runner.h" -#include "base/strings/string_util.h" #include "base/strings/string_tokenizer.h" -#include "googleurl/src/url_parse.h" +#include "base/strings/string_util.h" #include "jni/ProxyChangeListener_jni.h" #include "net/base/host_port_pair.h" #include "net/proxy/proxy_config.h" +#include "url/url_parse.h" using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index a38a37a..ba4b8e6 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -31,11 +31,11 @@ #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h" #include "base/timer/timer.h" -#include "googleurl/src/url_canon.h" #include "net/base/net_errors.h" #include "net/http/http_util.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_server.h" +#include "url/url_canon.h" #if defined(USE_GIO) #include "library_loaders/libgio.h" diff --git a/net/proxy/proxy_resolver.h b/net/proxy/proxy_resolver.h index 11df340..47ec31a 100644 --- a/net/proxy/proxy_resolver.h +++ b/net/proxy/proxy_resolver.h @@ -8,11 +8,11 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" #include "net/base/net_export.h" #include "net/proxy/proxy_resolver_script_data.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/proxy_resolver_mac.h b/net/proxy/proxy_resolver_mac.h index d791a7d..24eb10d 100644 --- a/net/proxy/proxy_resolver_mac.h +++ b/net/proxy/proxy_resolver_mac.h @@ -6,10 +6,10 @@ #define NET_PROXY_PROXY_RESOLVER_MAC_H_ #include "base/compiler_specific.h" -#include "googleurl/src/gurl.h" -#include "net/base/net_export.h" #include "net/base/net_errors.h" +#include "net/base/net_export.h" #include "net/proxy/proxy_resolver.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/proxy_resolver_script_data.h b/net/proxy/proxy_resolver_script_data.h index caa102b..16e17fd 100644 --- a/net/proxy/proxy_resolver_script_data.h +++ b/net/proxy/proxy_resolver_script_data.h @@ -7,8 +7,8 @@ #include "base/memory/ref_counted.h" #include "base/strings/string16.h" -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 4b1679a..28b9dbc 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -10,17 +10,17 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/strings/string_util.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "googleurl/src/gurl.h" -#include "googleurl/src/url_canon.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_script.h" +#include "url/gurl.h" +#include "url/url_canon.h" #include "v8/include/v8.h" // Notes on the javascript environment: diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc index dd74528..5124441 100644 --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc @@ -14,7 +14,6 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" @@ -24,6 +23,7 @@ #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_error_observer.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc index 73f88ce..67e7739 100644 --- a/net/proxy/proxy_resolver_v8_unittest.cc +++ b/net/proxy/proxy_resolver_v8_unittest.cc @@ -8,12 +8,12 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log_unittest.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_v8.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { namespace { diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc index 40d24a0..3273787 100644 --- a/net/proxy/proxy_resolver_winhttp.cc +++ b/net/proxy/proxy_resolver_winhttp.cc @@ -10,9 +10,9 @@ #include "base/metrics/histogram.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_info.h" +#include "url/gurl.h" #pragma comment(lib, "winhttp.lib") diff --git a/net/proxy/proxy_resolver_winhttp.h b/net/proxy/proxy_resolver_winhttp.h index 047fbf5..62b5643 100644 --- a/net/proxy/proxy_resolver_winhttp.h +++ b/net/proxy/proxy_resolver_winhttp.h @@ -6,8 +6,8 @@ #define NET_PROXY_PROXY_RESOLVER_WINHTTP_H_ #include "base/compiler_specific.h" -#include "googleurl/src/gurl.h" #include "net/proxy/proxy_resolver.h" +#include "url/gurl.h" typedef void* HINTERNET; // From winhttp.h diff --git a/net/proxy/proxy_script_decider.h b/net/proxy/proxy_script_decider.h index 5f39623..9a77938 100644 --- a/net/proxy/proxy_script_decider.h +++ b/net/proxy/proxy_script_decider.h @@ -12,12 +12,12 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "base/timer/timer.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_resolver.h" +#include "url/gurl.h" namespace net { diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 20710ca..3054b23 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -16,7 +16,6 @@ #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -29,6 +28,7 @@ #include "net/proxy/proxy_script_decider.h" #include "net/proxy/proxy_script_fetcher.h" #include "net/url_request/url_request_context.h" +#include "url/gurl.h" #if defined(OS_WIN) #include "net/proxy/proxy_config_service_win.h" diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index 5e20f82..c8551b0 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" @@ -22,6 +21,7 @@ #include "net/proxy/proxy_resolver.h" #include "net/proxy/proxy_script_fetcher.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" // TODO(eroman): Write a test which exercises // ProxyService::SuspendAllPendingRequests(). diff --git a/net/quic/crypto/crypto_utils.cc b/net/quic/crypto/crypto_utils.cc index 89ce4b4..9ecf3f2 100644 --- a/net/quic/crypto/crypto_utils.cc +++ b/net/quic/crypto/crypto_utils.cc @@ -5,7 +5,6 @@ #include "net/quic/crypto/crypto_utils.h" #include "crypto/hkdf.h" -#include "googleurl/src/url_canon.h" #include "net/base/net_util.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/crypto/crypto_protocol.h" @@ -13,6 +12,7 @@ #include "net/quic/crypto/quic_encrypter.h" #include "net/quic/crypto/quic_random.h" #include "net/quic/quic_time.h" +#include "url/url_canon.h" using base::StringPiece; using std::string; diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index f168636..b955e8f 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -11,13 +11,13 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/dns/host_resolver.h" #include "net/socket/stream_socket.h" +#include "url/gurl.h" namespace net { diff --git a/net/socket_stream/socket_stream_metrics.cc b/net/socket_stream/socket_stream_metrics.cc index 2df2701..e026887 100644 --- a/net/socket_stream/socket_stream_metrics.cc +++ b/net/socket_stream/socket_stream_metrics.cc @@ -8,7 +8,7 @@ #include "base/metrics/histogram.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { diff --git a/net/socket_stream/socket_stream_metrics_unittest.cc b/net/socket_stream/socket_stream_metrics_unittest.cc index 741acb7..219e692 100644 --- a/net/socket_stream/socket_stream_metrics_unittest.cc +++ b/net/socket_stream/socket_stream_metrics_unittest.cc @@ -9,9 +9,9 @@ #include "base/metrics/histogram.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "url/gurl.h" using base::Histogram; using base::HistogramBase; diff --git a/net/spdy/spdy_credential_state.h b/net/spdy/spdy_credential_state.h index 1460eac..505b012 100644 --- a/net/spdy/spdy_credential_state.h +++ b/net/spdy/spdy_credential_state.h @@ -7,8 +7,8 @@ #include <vector> -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" +#include "url/gurl.h" namespace net { diff --git a/net/spdy/spdy_http_utils.h b/net/spdy/spdy_http_utils.h index 9ca09de..26511a7 100644 --- a/net/spdy/spdy_http_utils.h +++ b/net/spdy/spdy_http_utils.h @@ -5,12 +5,12 @@ #ifndef NET_SPDY_SPDY_HTTP_UTILS_H_ #define NET_SPDY_SPDY_HTTP_UTILS_H_ -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" #include "net/base/request_priority.h" #include "net/spdy/spdy_framer.h" #include "net/spdy/spdy_header_block.h" #include "net/spdy/spdy_protocol.h" +#include "url/gurl.h" namespace net { diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc index e74f2b1..fa3300f 100644 --- a/net/spdy/spdy_proxy_client_socket.cc +++ b/net/spdy/spdy_proxy_client_socket.cc @@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "net/base/io_buffer.h" #include "net/base/net_util.h" @@ -21,6 +20,7 @@ #include "net/http/http_response_headers.h" #include "net/http/proxy_connect_redirect_http_stream.h" #include "net/spdy/spdy_http_utils.h" +#include "url/gurl.h" namespace net { diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h index ecf670c2..d78501e 100644 --- a/net/spdy/spdy_stream.h +++ b/net/spdy/spdy_stream.h @@ -14,7 +14,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "googleurl/src/gurl.h" #include "net/base/bandwidth_metrics.h" #include "net/base/io_buffer.h" #include "net/base/net_export.h" @@ -27,6 +26,7 @@ #include "net/spdy/spdy_protocol.h" #include "net/ssl/server_bound_cert_service.h" #include "net/ssl/ssl_client_cert_type.h" +#include "url/gurl.h" namespace net { diff --git a/net/spdy/spdy_websocket_stream.cc b/net/spdy/spdy_websocket_stream.cc index 97b6dc0..3a3022af 100644 --- a/net/spdy/spdy_websocket_stream.cc +++ b/net/spdy/spdy_websocket_stream.cc @@ -7,13 +7,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" -#include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/spdy/spdy_framer.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_stream.h" +#include "url/gurl.h" namespace net { diff --git a/net/ssl/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc index 0ccbc16..3740469 100644 --- a/net/ssl/server_bound_cert_service.cc +++ b/net/ssl/server_bound_cert_service.cc @@ -21,11 +21,11 @@ #include "base/stl_util.h" #include "base/task_runner.h" #include "crypto/ec_private_key.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cert/x509_certificate.h" #include "net/cert/x509_util.h" +#include "url/gurl.h" #if defined(USE_NSS) #include <private/pprthred.h> // PR_DetachThread diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h index 2cf9cb2..879c4a9 100644 --- a/net/test/embedded_test_server/embedded_test_server.h +++ b/net/test/embedded_test_server/embedded_test_server.h @@ -14,8 +14,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" -#include "googleurl/src/gurl.h" #include "net/socket/tcp_listen_socket.h" +#include "url/gurl.h" namespace base { class FilePath; diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc index 4a276b6..bf38b4e 100644 --- a/net/test/spawned_test_server/base_test_server.cc +++ b/net/test/spawned_test_server/base_test_server.cc @@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" @@ -22,6 +21,7 @@ #include "net/base/test_completion_callback.h" #include "net/cert/test_root_certs.h" #include "net/dns/host_resolver.h" +#include "url/gurl.h" namespace net { diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc index 34a6e66..1531708 100644 --- a/net/test/spawned_test_server/local_test_server.cc +++ b/net/test/spawned_test_server/local_test_server.cc @@ -11,10 +11,10 @@ #include "base/process_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/test/python_utils.h" +#include "url/gurl.h" namespace net { diff --git a/net/test/spawned_test_server/remote_test_server.cc b/net/test/spawned_test_server/remote_test_server.cc index abbbf3b..a3b4ef3 100644 --- a/net/test/spawned_test_server/remote_test_server.cc +++ b/net/test/spawned_test_server/remote_test_server.cc @@ -15,10 +15,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/test/spawned_test_server/spawner_communicator.h" +#include "url/gurl.h" namespace net { diff --git a/net/test/spawned_test_server/spawner_communicator.cc b/net/test/spawned_test_server/spawner_communicator.cc index ef44758..f93ff97 100644 --- a/net/test/spawned_test_server/spawner_communicator.cc +++ b/net/test/spawned_test_server/spawner_communicator.cc @@ -12,12 +12,12 @@ #include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" -#include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_test_util.h" +#include "url/gurl.h" namespace net { diff --git a/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp b/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp index aebdfba..4cf47c4 100644 --- a/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp +++ b/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp @@ -50,7 +50,7 @@ #include "base/base64.h" #include "base/logging.h" #include "crypto/nss_util.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace { diff --git a/net/tools/dump_cache/upgrade_win.cc b/net/tools/dump_cache/upgrade_win.cc index 3a79849..c24c67d 100644 --- a/net/tools/dump_cache/upgrade_win.cc +++ b/net/tools/dump_cache/upgrade_win.cc @@ -13,7 +13,6 @@ #include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/win/scoped_handle.h" -#include "googleurl/src/gurl.h" #include "net/base/cache_type.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" @@ -24,6 +23,7 @@ #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/tools/dump_cache/cache_dumper.h" +#include "url/gurl.h" namespace { diff --git a/net/tools/get_server_time/get_server_time.cc b/net/tools/get_server_time/get_server_time.cc index 3e3bac9..491b4b5 100644 --- a/net/tools/get_server_time/get_server_time.cc +++ b/net/tools/get_server_time/get_server_time.cc @@ -30,7 +30,6 @@ #include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/http/http_response_headers.h" @@ -40,6 +39,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" diff --git a/net/tools/quic/spdy_utils.cc b/net/tools/quic/spdy_utils.cc index a8a7b7b..13d05e5 100644 --- a/net/tools/quic/spdy_utils.cc +++ b/net/tools/quic/spdy_utils.cc @@ -7,14 +7,14 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/strings/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#include "googleurl/src/gurl.h" +#include "base/strings/string_util.h" #include "net/spdy/spdy_frame_builder.h" #include "net/spdy/spdy_framer.h" #include "net/spdy/spdy_protocol.h" #include "net/tools/flip_server/balsa_headers.h" +#include "url/gurl.h" using base::StringPiece; using std::pair; diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc index 4eccde2..9b5f261 100644 --- a/net/tools/quic/test_tools/quic_test_client.cc +++ b/net/tools/quic/test_tools/quic_test_client.cc @@ -4,13 +4,13 @@ #include "net/tools/quic/test_tools/quic_test_client.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" #include "net/cert/x509_certificate.h" #include "net/quic/crypto/proof_verifier.h" #include "net/tools/flip_server/balsa_headers.h" #include "net/tools/quic/test_tools/http_message_test_utils.h" +#include "url/gurl.h" using std::string; using std::vector; diff --git a/net/tools/tld_cleanup/tld_cleanup_util.cc b/net/tools/tld_cleanup/tld_cleanup_util.cc index efdc99b..dfa2620 100644 --- a/net/tools/tld_cleanup/tld_cleanup_util.cc +++ b/net/tools/tld_cleanup/tld_cleanup_util.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "googleurl/src/gurl.h" -#include "googleurl/src/url_parse.h" +#include "url/gurl.h" +#include "url/url_parse.h" namespace { diff --git a/net/url_request/ftp_protocol_handler.cc b/net/url_request/ftp_protocol_handler.cc index d873295..56d15e6 100644 --- a/net/url_request/ftp_protocol_handler.cc +++ b/net/url_request/ftp_protocol_handler.cc @@ -11,7 +11,7 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_error_job.h" #include "net/url_request/url_request_ftp_job.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h index 014775a..89f74c2 100644 --- a/net/url_request/test_url_fetcher_factory.h +++ b/net/url_request/test_url_fetcher_factory.h @@ -17,10 +17,10 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "googleurl/src/gurl.h" #include "net/http/http_request_headers.h" #include "net/url_request/url_fetcher_factory.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" namespace net { diff --git a/net/url_request/url_fetcher_core.h b/net/url_request/url_fetcher_core.h index 249cf78..27e253f 100644 --- a/net/url_request/url_fetcher_core.h +++ b/net/url_request/url_fetcher_core.h @@ -16,12 +16,12 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/http/http_request_headers.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" namespace base { class SingleThreadTaskRunner; diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 255f1cf..45a3f11 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -15,7 +15,6 @@ #include "base/supports_user_data.h" #include "base/threading/non_thread_safe.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" @@ -29,6 +28,7 @@ #include "net/http/http_request_headers.h" #include "net/http/http_response_info.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" // Temporary layering violation to allow existing users of a deprecated // interface. diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc index fa9bbfd..f0c8440 100644 --- a/net/url_request/url_request_file_dir_job.cc +++ b/net/url_request/url_request_file_dir_job.cc @@ -10,11 +10,11 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" #if defined(OS_POSIX) #include <sys/stat.h> diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index b3859d3..93a578f 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -26,10 +26,9 @@ #include "base/platform_file.h" #include "base/strings/string_util.h" #include "base/synchronization/lock.h" -#include "base/threading/worker_pool.h" #include "base/threading/thread_restrictions.h" +#include "base/threading/worker_pool.h" #include "build/build_config.h" -#include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" @@ -39,6 +38,7 @@ #include "net/http/http_util.h" #include "net/url_request/url_request_error_job.h" #include "net/url_request/url_request_file_dir_job.h" +#include "url/gurl.h" #if defined(OS_WIN) #include "base/win/shortcut.h" diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc index 3b4a790..f9eafab 100644 --- a/net/url_request/url_request_ftp_job_unittest.cc +++ b/net/url_request/url_request_ftp_job_unittest.cc @@ -7,7 +7,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/run_loop.h" -#include "googleurl/src/gurl.h" #include "net/ftp/ftp_auth_cache.h" #include "net/http/http_transaction_unittest.h" #include "net/proxy/mock_proxy_resolver.h" @@ -21,6 +20,7 @@ #include "net/url_request/url_request_status.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc index 9469a67..ce72054 100644 --- a/net/url_request/url_request_http_job_unittest.cc +++ b/net/url_request/url_request_http_job_unittest.cc @@ -8,13 +8,13 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "net/http/http_transaction_factory.h" #include "net/http/http_transaction_unittest.h" #include "net/url_request/url_request_status.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index 2f1ccc4..25e5d75 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -13,7 +13,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/power_monitor/power_observer.h" -#include "googleurl/src/gurl.h" #include "net/base/filter.h" #include "net/base/host_port_pair.h" #include "net/base/load_states.h" @@ -21,6 +20,7 @@ #include "net/base/request_priority.h" #include "net/base/upload_progress.h" #include "net/cookies/canonical_cookie.h" +#include "url/gurl.h" namespace net { diff --git a/net/url_request/url_request_job_factory_impl.cc b/net/url_request/url_request_job_factory_impl.cc index 84fb951..f456da2 100644 --- a/net/url_request/url_request_job_factory_impl.cc +++ b/net/url_request/url_request_job_factory_impl.cc @@ -5,9 +5,9 @@ #include "net/url_request/url_request_job_factory_impl.h" #include "base/stl_util.h" -#include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_job_manager.h" +#include "url/gurl.h" namespace net { diff --git a/net/url_request/url_request_netlog_params.cc b/net/url_request/url_request_netlog_params.cc index a247326..12c0d5d 100644 --- a/net/url_request/url_request_netlog_params.cc +++ b/net/url_request/url_request_netlog_params.cc @@ -6,7 +6,7 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index db05e6e..7d9000b 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -20,7 +20,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "googleurl/src/url_util.h" #include "net/base/io_buffer.h" #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" @@ -40,6 +39,7 @@ #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory.h" +#include "url/url_util.h" using base::TimeDelta; diff --git a/net/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h index 9623834..31d28ef 100644 --- a/net/url_request/url_request_throttler_manager.h +++ b/net/url_request/url_request_throttler_manager.h @@ -13,10 +13,10 @@ #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "base/threading/platform_thread.h" -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_throttler_entry.h" +#include "url/gurl.h" namespace net { diff --git a/net/websockets/websocket_handshake_handler.cc b/net/websockets/websocket_handshake_handler.cc index 610046c..e69bb6d 100644 --- a/net/websockets/websocket_handshake_handler.cc +++ b/net/websockets/websocket_handshake_handler.cc @@ -10,13 +10,13 @@ #include "base/md5.h" #include "base/sha1.h" #include "base/strings/string_number_conversions.h" -#include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" -#include "googleurl/src/gurl.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" +#include "url/gurl.h" namespace { diff --git a/net/websockets/websocket_handshake_handler_spdy_unittest.cc b/net/websockets/websocket_handshake_handler_spdy_unittest.cc index d019613..83c519d 100644 --- a/net/websockets/websocket_handshake_handler_spdy_unittest.cc +++ b/net/websockets/websocket_handshake_handler_spdy_unittest.cc @@ -6,11 +6,11 @@ #include <string> -#include "googleurl/src/gurl.h" #include "net/socket/next_proto.h" #include "net/spdy/spdy_header_block.h" #include "net/spdy/spdy_websocket_test_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { diff --git a/net/websockets/websocket_handshake_handler_unittest.cc b/net/websockets/websocket_handshake_handler_unittest.cc index 20ad2d4..e7d2d75 100644 --- a/net/websockets/websocket_handshake_handler_unittest.cc +++ b/net/websockets/websocket_handshake_handler_unittest.cc @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "googleurl/src/gurl.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" +#include "url/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index 34d4a25..8240850 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/lazy_instance.h" -#include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -22,6 +21,7 @@ #include "net/websockets/websocket_handshake_handler.h" #include "net/websockets/websocket_net_log_params.h" #include "net/websockets/websocket_throttle.h" +#include "url/gurl.h" static const int kMaxPendingSendAllowed = 32768; // 32 kilobytes. diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index 69f8560..28ba53c 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -13,7 +13,6 @@ #include "base/memory/ref_counted.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" @@ -34,6 +33,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "url/gurl.h" namespace net { diff --git a/net/websockets/websocket_throttle_unittest.cc b/net/websockets/websocket_throttle_unittest.cc index 4f0345c..d2d7b4c 100644 --- a/net/websockets/websocket_throttle_unittest.cc +++ b/net/websockets/websocket_throttle_unittest.cc @@ -7,7 +7,6 @@ #include <string> #include "base/message_loop.h" -#include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/test_completion_callback.h" #include "net/socket_stream/socket_stream.h" @@ -15,6 +14,7 @@ #include "net/websockets/websocket_job.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "url/gurl.h" class DummySocketStreamDelegate : public net::SocketStream::Delegate { public: |