From f89276a70b260213900fc4b389927a17d57590f3 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Fri, 12 Jul 2013 06:41:54 +0000 Subject: 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 --- net/proxy/dhcp_proxy_script_adapter_fetcher_win.h | 2 +- net/proxy/dhcp_proxy_script_fetcher.h | 2 +- net/proxy/mock_proxy_resolver.h | 2 +- net/proxy/mock_proxy_script_fetcher.h | 2 +- net/proxy/multi_threaded_proxy_resolver_unittest.cc | 2 +- net/proxy/proxy_bypass_rules.h | 2 +- net/proxy/proxy_config.h | 2 +- net/proxy/proxy_config_service_android.cc | 4 ++-- net/proxy/proxy_config_service_linux.cc | 2 +- net/proxy/proxy_resolver.h | 2 +- net/proxy/proxy_resolver_mac.h | 4 ++-- net/proxy/proxy_resolver_script_data.h | 2 +- net/proxy/proxy_resolver_v8.cc | 6 +++--- net/proxy/proxy_resolver_v8_tracing_unittest.cc | 2 +- net/proxy/proxy_resolver_v8_unittest.cc | 2 +- net/proxy/proxy_resolver_winhttp.cc | 2 +- net/proxy/proxy_resolver_winhttp.h | 2 +- net/proxy/proxy_script_decider.h | 2 +- net/proxy/proxy_service.cc | 2 +- net/proxy/proxy_service_unittest.cc | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) (limited to 'net/proxy') 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 #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 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 #include -#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 -#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(). -- cgit v1.1