diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 01:40:53 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 01:40:53 +0000 |
| commit | f2cb3cf86e4217581443d93e863c891a05066e60 (patch) | |
| tree | c62110d2347d17e1b1a1f57fa758cf8bba72548b | |
| parent | b8512263f9556ac705394e9da03d364980f0eadf (diff) | |
| download | chromium_src-f2cb3cf86e4217581443d93e863c891a05066e60.zip chromium_src-f2cb3cf86e4217581443d93e863c891a05066e60.tar.gz chromium_src-f2cb3cf86e4217581443d93e863c891a05066e60.tar.bz2 | |
net: move host_resolver files from net/base to net/dns
BUG=70818
Review URL: https://codereview.chromium.org/12518036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189485 0039d316-1c4b-4281-b951-d872f2087c98
156 files changed, 222 insertions, 220 deletions
diff --git a/chrome/browser/chrome_net_benchmarking_message_filter.cc b/chrome/browser/chrome_net_benchmarking_message_filter.cc index abe3652..f98e9c3 100644 --- a/chrome/browser/chrome_net_benchmarking_message_filter.cc +++ b/chrome/browser/chrome_net_benchmarking_message_filter.cc @@ -14,9 +14,9 @@ #include "chrome/common/benchmarking_messages.h" #include "chrome/common/chrome_switches.h" #include "net/base/host_cache.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/host_resolver.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" #include "net/http/http_stream_factory.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc index d52cf7e..9896582 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc @@ -16,7 +16,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "net/base/host_port_pair.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" namespace chromeos { diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_apitest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_apitest.cc index 0f8466c..3c2b3ef 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_apitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/extensions/extension_apitest.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WallpaperPicker) { host_resolver()->AddRule("a.com", "127.0.0.1"); diff --git a/chrome/browser/extensions/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log_browsertest.cc index 52bfaa2..8450603 100644 --- a/chrome/browser/extensions/activity_log_browsertest.cc +++ b/chrome/browser/extensions/activity_log_browsertest.cc @@ -8,7 +8,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" // Used to fire all of the listeners on the buttons. static const char kScriptClickAllTestButtons[] = diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc index 077e412..ea4b893 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/dns/dns_api.h b/chrome/browser/extensions/api/dns/dns_api.h index 1c646f6..56a0785 100644 --- a/chrome/browser/extensions/api/dns/dns_api.h +++ b/chrome/browser/extensions/api/dns/dns_api.h @@ -11,7 +11,7 @@ #include "chrome/browser/io_thread.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" class IOThread; diff --git a/chrome/browser/extensions/api/dns/dns_apitest.cc b/chrome/browser/extensions/api/dns/dns_apitest.cc index ce8cbab..3671879 100644 --- a/chrome/browser/extensions/api/dns/dns_apitest.cc +++ b/chrome/browser/extensions/api/dns/dns_apitest.cc @@ -10,9 +10,9 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/common/chrome_switches.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "net/dns/mock_host_resolver.h" using extension_function_test_utils::CreateEmptyExtension; using extension_function_test_utils::RunFunctionAndReturnSingleResult; diff --git a/chrome/browser/extensions/api/dns/host_resolver_wrapper.h b/chrome/browser/extensions/api/dns/host_resolver_wrapper.h index 35c9e52..ea8dc9d 100644 --- a/chrome/browser/extensions/api/dns/host_resolver_wrapper.h +++ b/chrome/browser/extensions/api/dns/host_resolver_wrapper.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_DNS_HOST_RESOLVER_WRAPPER_H_ #include "base/memory/singleton.h" -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" namespace extensions { diff --git a/chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc b/chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc index 03ba155..fa49956 100644 --- a/chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc +++ b/chrome/browser/extensions/api/dns/mock_host_resolver_creator.cc @@ -6,7 +6,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/browser_thread.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc index 959874c..fd32e96 100644 --- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc @@ -18,7 +18,7 @@ #include "chrome/common/extensions/features/feature.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/test/test_server.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/extensions/api/history/history_apitest.cc b/chrome/browser/extensions/api/history/history_apitest.cc index a032dc2..800aef6 100644 --- a/chrome/browser/extensions/api/history/history_apitest.cc +++ b/chrome/browser/extensions/api/history/history_apitest.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" namespace extensions { diff --git a/chrome/browser/extensions/api/idle/idle_apitest.cc b/chrome/browser/extensions/api/idle/idle_apitest.cc index 63edad7..64d7515 100644 --- a/chrome/browser/extensions/api/idle/idle_apitest.cc +++ b/chrome/browser/extensions/api/idle/idle_apitest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" // This test is flaky: crbug.com/130138 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Idle) { diff --git a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc index e0a7ad8..34e7654 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc +++ b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc @@ -4,11 +4,11 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/api/page_capture/page_capture_api.h" +#include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using extensions::PageCaptureSaveAsMHTMLFunction; diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc index 5b28864..73ec0fa 100644 --- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc +++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/permissions/permission_set.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using extensions::APIPermission; using extensions::APIPermissionSet; diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc index d56d123..13d7233 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc @@ -16,7 +16,7 @@ #include "chrome/common/extensions/extension_set.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_view_host.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" namespace { const char kTestExtensionId[] = "mfaehphpebmlbfdiegjnpidmibldjbjk"; diff --git a/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h b/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h index 808c08d..886f0f0 100644 --- a/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h +++ b/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" class Profile; class ProfileSyncServiceHarness; diff --git a/chrome/browser/extensions/api/socket/socket_api.h b/chrome/browser/extensions/api/socket/socket_api.h index b26e748..34013a4 100644 --- a/chrome/browser/extensions/api/socket/socket_api.h +++ b/chrome/browser/extensions/api/socket/socket_api.h @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extension_function.h" #include "chrome/common/extensions/api/socket.h" #include "net/base/address_list.h" -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" #include "net/socket/tcp_client_socket.h" #include <string> diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc index 73e62fa..7921ce9 100644 --- a/chrome/browser/extensions/api/socket/socket_apitest.cc +++ b/chrome/browser/extensions/api/socket/socket_apitest.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/test/test_server.h" using extensions::Extension; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index 42a1e92..d599ede 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -7,8 +7,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/utf_string_conversions.h" #include "base/stringprintf.h" +#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_browser_main.h" @@ -36,7 +36,7 @@ #include "content/public/common/context_menu_params.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/resource_type.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 12ff0e2..0e03c64 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -39,11 +39,11 @@ #include "content/public/test/test_browser_thread.h" #include "net/base/auth.h" #include "net/base/capturing_net_log.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" +#include "net/dns/mock_host_resolver.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest-message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index 8b115d8..c64d0bd 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -21,7 +21,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" using content::WebContents; diff --git a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc index 3209c7a..237941c 100644 --- a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc +++ b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc @@ -20,7 +20,7 @@ #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_util.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/web_socket_proxy_controller.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 5391317..360dd34 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -28,7 +28,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/common/gpu_info.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "ui/gl/gl_switches.h" using content::GpuFeatureType; diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index af85b86..ec55fcf 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -18,7 +18,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/test_notification_tracker.h" #include "content/public/test/test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using extensions::Extension; diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 53c1455..39fc84f 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -27,7 +27,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "sync/api/string_ordinal.h" using content::NavigationController; diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index a961366..3103e6f 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -21,7 +21,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using extensions::Extension; diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index bbee2a4..f3d5035 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -15,7 +15,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) { ASSERT_TRUE(StartTestServer()); diff --git a/chrome/browser/extensions/content_security_policy_apitest.cc b/chrome/browser/extensions/content_security_policy_apitest.cc index 1740e2e..d2a4969 100644 --- a/chrome/browser/extensions/content_security_policy_apitest.cc +++ b/chrome/browser/extensions/content_security_policy_apitest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSecurityPolicy) { ASSERT_TRUE(StartTestServer()); diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc index 8c24606..4198b7d 100644 --- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc +++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/extensions/extension_apitest.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRBackgroundPage) { host_resolver()->AddRule("*.com", "127.0.0.1"); diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc index d2861a7..2c081f1 100644 --- a/chrome/browser/extensions/execute_script_apitest.cc +++ b/chrome/browser/extensions/execute_script_apitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/extensions/extension_apitest.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" class ExecuteScriptApiTest : public ExtensionApiTest { protected: diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 90c2e67..1ea9ef5 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -17,7 +17,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/common/context_menu_params.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "ui/base/models/menu_model.h" diff --git a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc index a0c1544..4d7bdfb 100644 --- a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc +++ b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc @@ -10,7 +10,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" namespace { diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc index 9c5c4b8..0dd5064 100644 --- a/chrome/browser/extensions/extension_icon_source_apitest.cc +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" class ExtensionIconSourceTest : public ExtensionApiTest { protected: diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index a4f9ae1..0e21345 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -15,7 +15,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using content::WebContents; diff --git a/chrome/browser/extensions/extension_javascript_url_apitest.cc b/chrome/browser/extensions/extension_javascript_url_apitest.cc index 8a845e3..4076c145 100644 --- a/chrome/browser/extensions/extension_javascript_url_apitest.cc +++ b/chrome/browser/extensions/extension_javascript_url_apitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/extensions/extension_apitest.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" // If crashing, mark disabled and update http://crbug.com/63589. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, JavaScriptURLPermissions) { diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 5c4f224..afb4c64 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -21,7 +21,7 @@ #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "webkit/plugins/webplugininfo.h" using content::PluginService; diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index 3ccd727..f8ce956 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { protected: diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 2b748de..7927289 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -12,7 +12,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" // Possible race in ChromeURLDataManager. http://crbug.com/59198 #if defined(OS_MACOSX) || defined(OS_LINUX) diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 16307fb..f71ddb9 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -5,8 +5,8 @@ #include "base/path_service.h" #include "chrome/browser/extensions/extension_apitest.h" #include "content/public/common/content_paths.h" -#include "net/base/mock_host_resolver.h" #include "net/base/test_data_directory.h" +#include "net/dns/mock_host_resolver.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory())); diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 3d8712a..b7717bb 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -20,7 +20,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using content::ExecuteScript; using content::ExecuteScriptAndExtractString; diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index f35694e..685e488 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -29,7 +29,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using extensions::Extension; diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 4e07bc1..ecafade 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using content::NavigationController; using content::WebContents; diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc index 62ac4f9c..6f7fb56 100644 --- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc @@ -27,7 +27,7 @@ #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using content::WebContents; using extensions::DictionaryBuilder; diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 978f77c..5e2a0fc 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -22,7 +22,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(USE_ASH) diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h index 5518234..68ef522 100644 --- a/chrome/browser/intranet_redirect_detector.h +++ b/chrome/browser/intranet_redirect_detector.h @@ -13,8 +13,8 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" -#include "net/base/host_resolver_proc.h" #include "net/base/network_change_notifier.h" +#include "net/dns/host_resolver_proc.h" #include "net/url_request/url_fetcher_delegate.h" class PrefRegistrySimple; diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 40ed1d4..bff0283 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -43,11 +43,11 @@ #include "net/base/cert_verifier.h" #include "net/base/host_cache.h" #include "net/base/host_mapping_rules.h" -#include "net/base/host_resolver.h" -#include "net/base/mapped_host_resolver.h" #include "net/base/net_util.h" #include "net/base/sdch_manager.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" +#include "net/dns/mapped_host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_filter.h" #include "net/http/http_auth_handler_factory.h" diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 34906a6..384b26a 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -16,11 +16,11 @@ #include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_thread.h" #include "net/base/cert_verifier.h" -#include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index a482ca1..5b40ef4 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -7,8 +7,8 @@ #include "base/prefs/testing_pref_service.h" #include "content/public/test/test_browser_thread.h" #include "net/base/mock_cert_verifier.h" -#include "net/base/mock_host_resolver.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/mock_host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_layer.h" diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index 2fb5fa5..5a5ba24 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/test/test_server.h" using content::BrowserThread; diff --git a/chrome/browser/net/network_stats.h b/chrome/browser/net/network_stats.h index 7e008d9..de01790 100644 --- a/chrome/browser/net/network_stats.h +++ b/chrome/browser/net/network_stats.h @@ -17,10 +17,10 @@ #include "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/base/test_data_stream.h" +#include "net/dns/host_resolver.h" #include "net/proxy/proxy_info.h" #include "net/socket/socket.h" diff --git a/chrome/browser/net/network_stats_unittest.cc b/chrome/browser/net/network_stats_unittest.cc index e3c1a4a..99dffb2 100644 --- a/chrome/browser/net/network_stats_unittest.cc +++ b/chrome/browser/net/network_stats_unittest.cc @@ -6,10 +6,10 @@ #include "base/message_loop.h" #include "base/stringprintf.h" #include "chrome/browser/net/network_stats.h" -#include "net/base/host_resolver.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" +#include "net/dns/host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 0e3bbd8..6e82188 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -33,10 +33,10 @@ #include "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "net/url_request/url_request_context_getter.h" using base::TimeDelta; diff --git a/chrome/browser/net/predictor_browsertest.cc b/chrome/browser/net/predictor_browsertest.cc index 3182b8c..b2a00c7 100644 --- a/chrome/browser/net/predictor_browsertest.cc +++ b/chrome/browser/net/predictor_browsertest.cc @@ -10,9 +10,9 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/base/host_resolver_proc.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" +#include "net/dns/host_resolver_proc.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gmock/include/gmock/gmock.h" using content::BrowserThread; diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index dae3af3..f509e1c 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -18,8 +18,8 @@ #include "chrome/common/net/predictor_common.h" #include "content/public/test/test_browser_thread.h" #include "net/base/address_list.h" -#include "net/base/mock_host_resolver.h" #include "net/base/winsock_init.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; diff --git a/chrome/browser/policy/cloud/device_management_service.cc b/chrome/browser/policy/cloud/device_management_service.cc index bbefd1d..07a8df2 100644 --- a/chrome/browser/policy/cloud/device_management_service.cc +++ b/chrome/browser/policy/cloud/device_management_service.cc @@ -20,10 +20,10 @@ #include "content/public/common/content_client.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" -#include "net/base/host_resolver.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" #include "net/http/http_network_layer.h" #include "net/http/http_response_headers.h" #include "net/proxy/proxy_service.h" diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 78439db..bc7d22b 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -56,7 +56,7 @@ #include "content/public/test/test_utils.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/rlz/rlz_extension_apitest.cc b/chrome/browser/rlz/rlz_extension_apitest.cc index dca0967..bb06299 100644 --- a/chrome/browser/rlz/rlz_extension_apitest.cc +++ b/chrome/browser/rlz/rlz_extension_apitest.cc @@ -5,13 +5,13 @@ #include <map> #include "chrome/browser/browser_process.h" +#include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/rlz/rlz_extension_api.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "rlz/lib/rlz_lib.h" #if (OS_WIN) diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 47a7f99..d25ebe4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -44,9 +44,9 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_context.h" #include "content/public/test/test_browser_thread.h" -#include "net/base/host_resolver.h" #include "net/base/load_flags.h" #include "net/base/net_log.h" +#include "net/dns/host_resolver.h" #include "net/test/python_utils.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/search_engines/template_url_scraper_unittest.cc b/chrome/browser/search_engines/template_url_scraper_unittest.cc index be62ded..999c525 100644 --- a/chrome/browser/search_engines/template_url_scraper_unittest.cc +++ b/chrome/browser/search_engines/template_url_scraper_unittest.cc @@ -3,17 +3,17 @@ // found in the LICENSE file. #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" +#include "net/dns/mock_host_resolver.h" namespace { class TemplateURLScraperTest : public InProcessBrowserTest { diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h index 1d16691..3fe583f 100644 --- a/chrome/browser/sync/test/integration/sync_test.h +++ b/chrome/browser/sync/test/integration/sync_test.h @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/process_util.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/protocol/sync_protocol_error.h" #include "sync/test/local_sync_test_server.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 47eeac0..a293372 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -37,7 +37,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/page_transition_types.h" #include "grit/generated_resources.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 80a823c..799040d 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -66,7 +66,7 @@ #include "content/public/test/test_navigation_observer.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/test/test_server.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index 0c104bc..6291815 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -20,7 +20,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "net/base/auth.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" using content::NavigationController; using content::OpenURLParams; diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index a417cb5..2af3ec1 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -37,7 +37,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/search/instant_extended_manual_browsertest.cc b/chrome/browser/ui/search/instant_extended_manual_browsertest.cc index c0e277d..225e089 100644 --- a/chrome/browser/ui/search/instant_extended_manual_browsertest.cc +++ b/chrome/browser/ui/search/instant_extended_manual_browsertest.cc @@ -24,7 +24,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" // Instant extended tests that need to be run manually because they need to // talk to the external network. All tests in this file should be marked as diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 3bb1d48..4f82a4d 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -57,10 +57,10 @@ #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" #include "net/base/host_cache.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/host_resolver.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" #include "net/http/http_network_session.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index c88584d..9672637 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -23,9 +23,9 @@ #include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/host_cache.h" -#include "net/base/host_resolver.h" -#include "net/base/host_resolver_proc.h" #include "net/base/net_errors.h" +#include "net/dns/host_resolver.h" +#include "net/dns/host_resolver_proc.h" #include "net/http/http_network_session.h" #include "net/http/http_pipelined_host_capability.h" #include "net/http/http_transaction_factory.h" diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index edc99bc..7e7bbb3 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -31,7 +31,7 @@ #include "extensions/common/error_utils.h" #include "googleurl/src/gurl.h" #include "net/base/mime_sniffer.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "skia/ext/image_operations.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc index cc8bacb..5fdee43 100644 --- a/chrome/service/net/service_url_request_context.cc +++ b/chrome/service/net/service_url_request_context.cc @@ -15,8 +15,8 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/service/service_process.h" #include "net/base/cert_verifier.h" -#include "net/base/host_resolver.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h index 6bcc7e0..c409ede 100644 --- a/chrome/service/net/service_url_request_context.h +++ b/chrome/service/net/service_url_request_context.h @@ -8,9 +8,9 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "net/base/host_resolver.h" #include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc index ca41120..26d359e 100644 --- a/chrome/test/base/chrome_test_suite.cc +++ b/chrome/test/base/chrome_test_suite.cc @@ -26,9 +26,9 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_browser_process.h" #include "content/public/test/test_launcher.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_handle.h" diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 53aad1c..fb99e8f 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -44,7 +44,7 @@ #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_launcher.h" #include "content/public/test/test_navigation_observer.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/test/test_server.h" #include "ui/compositor/compositor_switches.h" diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index f9bfefe..79d6bbb 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -32,8 +32,8 @@ #include "content/public/test/test_utils.h" #include "content/test/gpu/gpu_test_config.h" #include "googleurl/src/gurl.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index a489a83..f893e7a 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -11,9 +11,9 @@ #include "base/stringprintf.h" #include "base/win/scoped_handle.h" #include "chrome_frame/test/test_server.h" -#include "net/base/host_resolver_proc.h" #include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/host_resolver_proc.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc index 7b8151d..7c79711 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc @@ -7,14 +7,14 @@ #include "base/bind.h" #include "base/stl_util.h" #include "content/browser/renderer_host/p2p/socket_host.h" -#include "content/public/browser/resource_context.h" #include "content/common/p2p_messages.h" +#include "content/public/browser/resource_context.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/base/single_request_host_resolver.h" #include "net/base/sys_addrinfo.h" +#include "net/dns/single_request_host_resolver.h" using content::BrowserMessageFilter; using content::BrowserThread; diff --git a/content/browser/renderer_host/pepper/pepper_host_resolver_private_message_filter.cc b/content/browser/renderer_host/pepper/pepper_host_resolver_private_message_filter.cc index 05aa6f8..c04aafe 100644 --- a/content/browser/renderer_host/pepper/pepper_host_resolver_private_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_host_resolver_private_message_filter.cc @@ -15,7 +15,7 @@ #include "content/public/browser/resource_context.h" #include "content/public/common/socket_permission_request.h" #include "net/base/address_list.h" -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_host_resolver_private.h" #include "ppapi/c/private/ppb_net_address_private.h" diff --git a/content/browser/renderer_host/pepper/pepper_lookup_request.h b/content/browser/renderer_host/pepper/pepper_lookup_request.h index f08a02b..bcb9a60 100644 --- a/content/browser/renderer_host/pepper/pepper_lookup_request.h +++ b/content/browser/renderer_host/pepper/pepper_lookup_request.h @@ -8,9 +8,9 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "net/base/address_list.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" namespace content { diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc index baa60e3..e6732e5 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc @@ -15,12 +15,12 @@ #include "content/public/browser/browser_thread.h" #include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/base/single_request_host_resolver.h" #include "net/base/x509_certificate.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index 70a3dae..88dd801 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -16,9 +16,9 @@ #include "content/shell/shell_network_delegate.h" #include "content/shell/shell_switches.h" #include "net/base/cert_verifier.h" -#include "net/base/host_resolver.h" -#include "net/base/mapped_host_resolver.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" +#include "net/dns/mapped_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" diff --git a/jingle/glue/proxy_resolving_client_socket_unittest.cc b/jingle/glue/proxy_resolving_client_socket_unittest.cc index 682c543..834d7d24 100644 --- a/jingle/glue/proxy_resolving_client_socket_unittest.cc +++ b/jingle/glue/proxy_resolving_client_socket_unittest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "net/base/mock_host_resolver.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" #include "net/url_request/url_request_context_getter.h" diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc index 20a9bf7..582b808 100644 --- a/jingle/notifier/communicator/single_login_attempt_unittest.cc +++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc @@ -12,7 +12,7 @@ #include "jingle/notifier/base/const_communicator.h" #include "jingle/notifier/base/fake_base_task.h" #include "jingle/notifier/communicator/login_settings.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/url_request/url_request_test_util.h" #include "talk/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" diff --git a/net/base/host_resolver.cc b/net/dns/host_resolver.cc index 7d98dd6..6350d2e 100644 --- a/net/base/host_resolver.cc +++ b/net/dns/host_resolver.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/string_number_conversions.h" #include "base/strings/string_split.h" #include "net/base/host_cache.h" -#include "net/base/host_resolver_impl.h" #include "net/dns/dns_client.h" #include "net/dns/dns_config_service.h" +#include "net/dns/host_resolver_impl.h" namespace net { diff --git a/net/base/host_resolver.h b/net/dns/host_resolver.h index b697dc2..1adf8b7 100644 --- a/net/base/host_resolver.h +++ b/net/dns/host_resolver.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_HOST_RESOLVER_H_ -#define NET_BASE_HOST_RESOLVER_H_ +#ifndef NET_DNS_HOST_RESOLVER_H_ +#define NET_DNS_HOST_RESOLVER_H_ #include <string> @@ -205,4 +205,4 @@ class NET_EXPORT HostResolver { } // namespace net -#endif // NET_BASE_HOST_RESOLVER_H_ +#endif // NET_DNS_HOST_RESOLVER_H_ diff --git a/net/base/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc index ba59569..91475ec 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/host_resolver_impl.h" +#include "net/dns/host_resolver_impl.h" #if defined(OS_WIN) #include <Winsock2.h> @@ -34,7 +34,6 @@ #include "net/base/address_list.h" #include "net/base/dns_reloader.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver_proc.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_util.h" @@ -44,6 +43,7 @@ #include "net/dns/dns_protocol.h" #include "net/dns/dns_response.h" #include "net/dns/dns_transaction.h" +#include "net/dns/host_resolver_proc.h" #if defined(OS_WIN) #include "net/base/winsock_init.h" diff --git a/net/base/host_resolver_impl.h b/net/dns/host_resolver_impl.h index 29a6d67..2519d13 100644 --- a/net/base/host_resolver_impl.h +++ b/net/dns/host_resolver_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_HOST_RESOLVER_IMPL_H_ -#define NET_BASE_HOST_RESOLVER_IMPL_H_ +#ifndef NET_DNS_HOST_RESOLVER_IMPL_H_ +#define NET_DNS_HOST_RESOLVER_IMPL_H_ #include <map> @@ -16,11 +16,11 @@ #include "base/time.h" #include "net/base/capturing_net_log.h" #include "net/base/host_cache.h" -#include "net/base/host_resolver.h" -#include "net/base/host_resolver_proc.h" #include "net/base/net_export.h" #include "net/base/network_change_notifier.h" #include "net/base/prioritized_dispatcher.h" +#include "net/dns/host_resolver.h" +#include "net/dns/host_resolver_proc.h" namespace net { @@ -284,4 +284,4 @@ class NET_EXPORT HostResolverImpl } // namespace net -#endif // NET_BASE_HOST_RESOLVER_IMPL_H_ +#endif // NET_DNS_HOST_RESOLVER_IMPL_H_ diff --git a/net/base/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc index d0c8fcb..4880b65 100644 --- a/net/base/host_resolver_impl_unittest.cc +++ b/net/dns/host_resolver_impl_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/host_resolver_impl.h" +#include "net/dns/host_resolver_impl.h" #include <algorithm> #include <string> @@ -20,11 +20,11 @@ #include "base/time.h" #include "net/base/address_list.h" #include "net/base/host_cache.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/dns/dns_client.h" #include "net/dns/dns_test_util.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc index 15693fd..6c786a1 100644 --- a/net/base/host_resolver_proc.cc +++ b/net/dns/host_resolver_proc.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/host_resolver_proc.h" +#include "net/dns/host_resolver_proc.h" #include "build/build_config.h" diff --git a/net/base/host_resolver_proc.h b/net/dns/host_resolver_proc.h index 6131db4f..b4fc0fa 100644 --- a/net/base/host_resolver_proc.h +++ b/net/dns/host_resolver_proc.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_HOST_RESOLVER_PROC_H_ -#define NET_BASE_HOST_RESOLVER_PROC_H_ +#ifndef NET_DNS_HOST_RESOLVER_PROC_H_ +#define NET_DNS_HOST_RESOLVER_PROC_H_ #include <string> @@ -93,4 +93,4 @@ NET_EXPORT_PRIVATE int SystemHostResolverProc( } // namespace net -#endif // NET_BASE_HOST_RESOLVER_PROC_H_ +#endif // NET_DNS_HOST_RESOLVER_PROC_H_ diff --git a/net/base/mapped_host_resolver.cc b/net/dns/mapped_host_resolver.cc index a8bd020..c905b34 100644 --- a/net/base/mapped_host_resolver.cc +++ b/net/dns/mapped_host_resolver.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/mapped_host_resolver.h" +#include "net/dns/mapped_host_resolver.h" #include "base/string_util.h" #include "net/base/host_port_pair.h" diff --git a/net/base/mapped_host_resolver.h b/net/dns/mapped_host_resolver.h index 114e621..db64689 100644 --- a/net/base/mapped_host_resolver.h +++ b/net/dns/mapped_host_resolver.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_MAPPED_HOST_RESOLVER_H_ -#define NET_BASE_MAPPED_HOST_RESOLVER_H_ +#ifndef NET_DNS_MAPPED_HOST_RESOLVER_H_ +#define NET_DNS_MAPPED_HOST_RESOLVER_H_ #include <string> #include "base/memory/scoped_ptr.h" #include "net/base/host_mapping_rules.h" -#include "net/base/host_resolver.h" #include "net/base/net_export.h" +#include "net/dns/host_resolver.h" namespace net { @@ -69,4 +69,4 @@ class NET_EXPORT MappedHostResolver : public HostResolver { } // namespace net -#endif // NET_BASE_MAPPED_HOST_RESOLVER_H_ +#endif // NET_DNS_MAPPED_HOST_RESOLVER_H_ diff --git a/net/base/mapped_host_resolver_unittest.cc b/net/dns/mapped_host_resolver_unittest.cc index 35fe011..8da95e1 100644 --- a/net/base/mapped_host_resolver_unittest.cc +++ b/net/dns/mapped_host_resolver_unittest.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/mapped_host_resolver.h" +#include "net/dns/mapped_host_resolver.h" #include "net/base/address_list.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc index 47554fe..fb03836 100644 --- a/net/base/mock_host_resolver.cc +++ b/net/dns/mock_host_resolver.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include <string> #include <vector> diff --git a/net/base/mock_host_resolver.h b/net/dns/mock_host_resolver.h index ee6f1b5..d22e800c 100644 --- a/net/base/mock_host_resolver.h +++ b/net/dns/mock_host_resolver.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_MOCK_HOST_RESOLVER_H_ -#define NET_BASE_MOCK_HOST_RESOLVER_H_ +#ifndef NET_DNS_MOCK_HOST_RESOLVER_H_ +#define NET_DNS_MOCK_HOST_RESOLVER_H_ #include <list> #include <map> @@ -11,8 +11,8 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/threading/non_thread_safe.h" -#include "net/base/host_resolver.h" -#include "net/base/host_resolver_proc.h" +#include "net/dns/host_resolver.h" +#include "net/dns/host_resolver_proc.h" namespace net { @@ -251,4 +251,4 @@ class ScopedDefaultHostResolverProc { } // namespace net -#endif // NET_BASE_MOCK_HOST_RESOLVER_H_ +#endif // NET_DNS_MOCK_HOST_RESOLVER_H_ diff --git a/net/base/single_request_host_resolver.cc b/net/dns/single_request_host_resolver.cc index b975c00..e926e86 100644 --- a/net/base/single_request_host_resolver.cc +++ b/net/dns/single_request_host_resolver.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/single_request_host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "base/bind.h" #include "base/bind_helpers.h" diff --git a/net/base/single_request_host_resolver.h b/net/dns/single_request_host_resolver.h index 89d249f..52d0132 100644 --- a/net/base/single_request_host_resolver.h +++ b/net/dns/single_request_host_resolver.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_SINGLE_REQUEST_HOST_RESOLVER_H_ -#define NET_BASE_SINGLE_REQUEST_HOST_RESOLVER_H_ +#ifndef NET_DNS_SINGLE_REQUEST_HOST_RESOLVER_H_ +#define NET_DNS_SINGLE_REQUEST_HOST_RESOLVER_H_ -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" namespace net { @@ -53,4 +53,4 @@ class NET_EXPORT SingleRequestHostResolver { } // namespace net -#endif // NET_BASE_SINGLE_REQUEST_HOST_RESOLVER_H_ +#endif // NET_DNS_SINGLE_REQUEST_HOST_RESOLVER_H_ diff --git a/net/base/single_request_host_resolver_unittest.cc b/net/dns/single_request_host_resolver_unittest.cc index b23a722..3e2ea1e 100644 --- a/net/base/single_request_host_resolver_unittest.cc +++ b/net/dns/single_request_host_resolver_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/single_request_host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "net/base/address_list.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h index e425c36..5eb6aae7 100644 --- a/net/ftp/ftp_network_transaction.h +++ b/net/ftp/ftp_network_transaction.h @@ -13,9 +13,9 @@ #include "base/memory/scoped_ptr.h" #include "net/base/address_list.h" #include "net/base/auth.h" -#include "net/base/host_resolver.h" #include "net/base/net_log.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "net/ftp/ftp_ctrl_response_buffer.h" #include "net/ftp/ftp_response_info.h" #include "net/ftp/ftp_transaction.h" diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc index c9ddb66..efc5143 100644 --- a/net/ftp/ftp_network_transaction_unittest.cc +++ b/net/ftp/ftp_network_transaction_unittest.cc @@ -13,9 +13,9 @@ #include "base/utf_string_conversions.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/ftp/ftp_network_session.h" #include "net/ftp/ftp_request_info.h" #include "net/socket/socket_test_util.h" diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc index 1ab12ad..0dcb5bb 100644 --- a/net/http/http_auth_controller.cc +++ b/net/http/http_auth_controller.cc @@ -11,8 +11,8 @@ #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" #include "net/base/auth.h" -#include "net/base/host_resolver.h" #include "net/base/net_util.h" +#include "net/dns/host_resolver.h" #include "net/http/http_auth_handler.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc index cc5c6d4..8e69919 100644 --- a/net/http/http_auth_handler_factory_unittest.cc +++ b/net/http/http_auth_handler_factory_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/mock_allow_url_security_manager.h" diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc index 35681c4..f509d90 100644 --- a/net/http/http_auth_handler_negotiate.cc +++ b/net/http/http_auth_handler_negotiate.cc @@ -11,9 +11,9 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "net/base/address_family.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "net/http/http_auth_filter.h" #include "net/http/url_security_manager.h" diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc index 4d8eaf4..9891c20 100644 --- a/net/http/http_auth_handler_negotiate_unittest.cc +++ b/net/http/http_auth_handler_negotiate_unittest.cc @@ -6,9 +6,9 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_request_info.h" #include "net/http/mock_allow_url_security_manager.h" #if defined(OS_WIN) diff --git a/net/http/http_auth_unittest.cc b/net/http/http_auth_unittest.cc index e70cb0d..88c7f95 100644 --- a/net/http/http_auth_unittest.cc +++ b/net/http/http_auth_unittest.cc @@ -8,8 +8,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth.h" #include "net/http/http_auth_filter.h" #include "net/http/http_auth_handler.h" diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc index ac052de..b0bfd79 100644 --- a/net/http/http_network_layer_unittest.cc +++ b/net/http/http_network_layer_unittest.cc @@ -5,8 +5,8 @@ #include "net/http/http_network_layer.h" #include "net/base/mock_cert_verifier.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_log.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/http/http_transaction_unittest.h" diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index db9d762..f095ad6 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -9,8 +9,8 @@ #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" #include "net/base/net_export.h" +#include "net/dns/host_resolver.h" #include "net/http/http_auth_cache.h" #include "net/http/http_stream_factory.h" #include "net/quic/quic_stream_factory.h" diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index 74e4a464..e773011 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -27,7 +27,6 @@ #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/mock_cert_verifier.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" @@ -36,6 +35,7 @@ #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_digest.h" #include "net/http/http_auth_handler_mock.h" #include "net/http/http_auth_handler_ntlm.h" diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index e2a262e..8bc44db 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -27,7 +27,6 @@ #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/mock_cert_verifier.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" @@ -36,6 +35,7 @@ #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_digest.h" #include "net/http/http_auth_handler_mock.h" #include "net/http/http_auth_handler_ntlm.h" diff --git a/net/http/http_pipelined_network_transaction_unittest.cc b/net/http/http_pipelined_network_transaction_unittest.cc index 1976d6a..d13c31e 100644 --- a/net/http/http_pipelined_network_transaction_unittest.cc +++ b/net/http/http_pipelined_network_transaction_unittest.cc @@ -12,10 +12,10 @@ #include "net/base/address_list.h" #include "net/base/host_cache.h" #include "net/base/io_buffer.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/request_priority.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_mock.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc index a7ece96..f720e4f 100644 --- a/net/http/http_stream_factory_impl_unittest.cc +++ b/net/http/http_stream_factory_impl_unittest.cc @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "net/base/mock_cert_verifier.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_log.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" #include "net/http/http_network_session_peer.h" diff --git a/net/net.gyp b/net/net.gyp index f66d8f6..0b43937 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -170,12 +170,6 @@ 'base/host_mapping_rules.h', 'base/host_port_pair.cc', 'base/host_port_pair.h', - 'base/host_resolver.cc', - 'base/host_resolver.h', - 'base/host_resolver_impl.cc', - 'base/host_resolver_impl.h', - 'base/host_resolver_proc.cc', - 'base/host_resolver_proc.h', 'base/io_buffer.cc', 'base/io_buffer.h', 'base/ip_endpoint.cc', @@ -193,8 +187,6 @@ 'base/load_states_list.h', 'base/load_timing_info.cc', 'base/load_timing_info.h', - 'base/mapped_host_resolver.cc', - 'base/mapped_host_resolver.h', 'base/mime_sniffer.cc', 'base/mime_sniffer.h', 'base/mime_util.cc', @@ -259,8 +251,6 @@ 'base/sdch_manager.h', 'base/single_request_cert_verifier.cc', 'base/single_request_cert_verifier.h', - 'base/single_request_host_resolver.cc', - 'base/single_request_host_resolver.h', 'base/static_cookie_policy.cc', 'base/static_cookie_policy.h', 'base/stream_listen_socket.cc', @@ -432,10 +422,20 @@ 'dns/dns_socket_pool.h', 'dns/dns_transaction.cc', 'dns/dns_transaction.h', + 'dns/host_resolver.cc', + 'dns/host_resolver.h', + 'dns/host_resolver_impl.cc', + 'dns/host_resolver_impl.h', + 'dns/host_resolver_proc.cc', + 'dns/host_resolver_proc.h', + 'dns/mapped_host_resolver.cc', + 'dns/mapped_host_resolver.h', 'dns/notify_watcher_mac.cc', 'dns/notify_watcher_mac.h', 'dns/serial_worker.cc', 'dns/serial_worker.h', + 'dns/single_request_host_resolver.cc', + 'dns/single_request_host_resolver.h', 'ftp/ftp_auth_cache.cc', 'ftp/ftp_auth_cache.h', 'ftp/ftp_ctrl_response_buffer.cc', @@ -1391,10 +1391,8 @@ 'base/host_cache_unittest.cc', 'base/host_mapping_rules_unittest.cc', 'base/host_port_pair_unittest.cc', - 'base/host_resolver_impl_unittest.cc', 'base/ip_endpoint_unittest.cc', 'base/keygen_handler_unittest.cc', - 'base/mapped_host_resolver_unittest.cc', 'base/mime_sniffer_unittest.cc', 'base/mime_util_unittest.cc', 'base/mock_filter_context.cc', @@ -1410,7 +1408,6 @@ 'base/priority_queue_unittest.cc', 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc', 'base/sdch_filter_unittest.cc', - 'base/single_request_host_resolver_unittest.cc', 'base/static_cookie_policy_unittest.cc', 'base/tcp_listen_socket_unittest.cc', 'base/tcp_listen_socket_unittest.h', @@ -1453,7 +1450,10 @@ 'dns/dns_response_unittest.cc', 'dns/dns_session_unittest.cc', 'dns/dns_transaction_unittest.cc', + 'dns/host_resolver_impl_unittest.cc', + 'dns/mapped_host_resolver_unittest.cc', 'dns/serial_worker_unittest.cc', + 'dns/single_request_host_resolver_unittest.cc', 'ftp/ftp_auth_cache_unittest.cc', 'ftp/ftp_ctrl_response_buffer_unittest.cc', 'ftp/ftp_directory_listing_parser_ls_unittest.cc', @@ -1982,8 +1982,6 @@ 'base/mock_cert_verifier.h', 'base/mock_file_stream.cc', 'base/mock_file_stream.h', - 'base/mock_host_resolver.cc', - 'base/mock_host_resolver.h', 'base/test_completion_callback.cc', 'base/test_completion_callback.h', 'base/test_data_directory.cc', @@ -2002,6 +2000,8 @@ 'disk_cache/flash/flash_cache_test_base.cc', 'dns/dns_test_util.cc', 'dns/dns_test_util.h', + 'dns/mock_host_resolver.cc', + 'dns/mock_host_resolver.h', 'proxy/mock_proxy_resolver.cc', 'proxy/mock_proxy_resolver.h', 'proxy/mock_proxy_script_fetcher.cc', diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc index 762e053..aa25d51 100644 --- a/net/proxy/proxy_resolver_perftest.cc +++ b/net/proxy/proxy_resolver_perftest.cc @@ -8,8 +8,8 @@ #include "base/path_service.h" #include "base/perftimer.h" #include "base/string_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" +#include "net/dns/mock_host_resolver.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_v8.h" #include "net/test/test_server.h" diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc index 198418f..a453768 100644 --- a/net/proxy/proxy_resolver_v8_tracing.cc +++ b/net/proxy/proxy_resolver_v8_tracing.cc @@ -14,9 +14,9 @@ #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "net/base/address_list.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" +#include "net/dns/host_resolver.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_error_observer.h" #include "net/proxy/proxy_resolver_v8.h" diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc index e0162d4..d3b15c3 100644 --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc @@ -16,11 +16,11 @@ #include "base/values.h" #include "googleurl/src/gurl.h" #include "net/base/host_cache.h" -#include "net/base/mock_host_resolver.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/dns/mock_host_resolver.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_error_observer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index e4ea2b9..19c6246 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -12,10 +12,10 @@ #include "base/utf_string_conversions.h" #include "net/base/load_flags.h" #include "net/base/mock_cert_verifier.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc index c9418e8..293beec 100644 --- a/net/quic/quic_network_transaction_unittest.cc +++ b/net/quic/quic_network_transaction_unittest.cc @@ -6,8 +6,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "net/base/mock_cert_verifier.h" -#include "net/base/mock_host_resolver.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index 1cb3ff3..e33306a 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -11,9 +11,9 @@ #include "base/rand_util.h" #include "base/stl_util.h" #include "base/values.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "net/quic/crypto/quic_random.h" #include "net/quic/quic_client_session.h" #include "net/quic/quic_clock.h" diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc index 34b06b8..a34f80a 100644 --- a/net/quic/quic_stream_factory_test.cc +++ b/net/quic/quic_stream_factory_test.cc @@ -6,7 +6,7 @@ #include "base/run_loop.h" #include "base/string_util.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/http/http_util.h" diff --git a/net/socket/client_socket_pool.h b/net/socket/client_socket_pool.h index 7a274b7..9445845 100644 --- a/net/socket/client_socket_pool.h +++ b/net/socket/client_socket_pool.h @@ -10,13 +10,13 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/time.h" #include "base/template_util.h" +#include "base/time.h" #include "net/base/completion_callback.h" -#include "net/base/host_resolver.h" #include "net/base/load_states.h" #include "net/base/net_export.h" #include "net/base/request_priority.h" +#include "net/dns/host_resolver.h" namespace base { class DictionaryValue; diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index 38810df..cf6a484 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -14,9 +14,9 @@ #include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" -#include "net/base/host_resolver.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" namespace net { diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index efdd129..9a55090 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -12,9 +12,9 @@ #include "net/base/address_list.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" -#include "net/base/mock_host_resolver.h" #include "net/base/test_completion_callback.h" #include "net/base/winsock_init.h" +#include "net/dns/mock_host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/socket_test_util.h" #include "net/socket/tcp_client_socket.h" diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h index 6e74409..17d3ca6 100644 --- a/net/socket/socks_client_socket.h +++ b/net/socket/socks_client_socket.h @@ -13,10 +13,10 @@ #include "base/memory/scoped_ptr.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" #include "net/socket/stream_socket.h" namespace net { diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h index 96c48426..3fb08eb 100644 --- a/net/socket/socks_client_socket_pool.h +++ b/net/socket/socks_client_socket_pool.h @@ -13,10 +13,10 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/socket/client_socket_pool.h" #include "net/socket/client_socket_pool_base.h" #include "net/socket/client_socket_pool_histograms.h" -#include "net/socket/client_socket_pool.h" namespace net { diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc index ab559ca..1c0e5a6 100644 --- a/net/socket/socks_client_socket_pool_unittest.cc +++ b/net/socket/socks_client_socket_pool_unittest.cc @@ -9,9 +9,9 @@ #include "base/time.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/client_socket_pool_histograms.h" diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index 2677b5b..cff9c26 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -7,12 +7,12 @@ #include "net/base/address_list.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" -#include "net/base/mock_host_resolver.h" #include "net/base/test_completion_callback.h" #include "net/base/winsock_init.h" +#include "net/dns/mock_host_resolver.h" #include "net/socket/client_socket_factory.h" -#include "net/socket/tcp_client_socket.h" #include "net/socket/socket_test_util.h" +#include "net/socket/tcp_client_socket.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket/ssl_client_socket_openssl_unittest.cc b/net/socket/ssl_client_socket_openssl_unittest.cc index 85f5a0c..5b0bb2a 100644 --- a/net/socket/ssl_client_socket_openssl_unittest.cc +++ b/net/socket/ssl_client_socket_openssl_unittest.cc @@ -21,7 +21,6 @@ #include "crypto/openssl_util.h" #include "net/base/address_list.h" #include "net/base/cert_test_util.h" -#include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" @@ -31,6 +30,7 @@ #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" #include "net/base/test_root_certs.h" +#include "net/dns/host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/socket_test_util.h" diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index a0a5d3b..e6e291e 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_client_socket_pool.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" #include "net/http/http_response_info.h" #include "net/proxy/proxy_server.h" #include "net/socket/client_socket_pool.h" diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 6e31442..4d52729 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -13,10 +13,10 @@ #include "net/base/cert_verifier.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/test_certificate_data.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" #include "net/http/http_request_headers.h" diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 3163077..6507f0d 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -8,7 +8,6 @@ #include "base/memory/ref_counted.h" #include "net/base/address_list.h" #include "net/base/cert_test_util.h" -#include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/mock_cert_verifier.h" #include "net/base/net_errors.h" @@ -17,6 +16,7 @@ #include "net/base/test_completion_callback.h" #include "net/base/test_data_directory.h" #include "net/base/test_root_certs.h" +#include "net/dns/host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/socket_test_util.h" diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h index 2a1053c..f0900b2 100644 --- a/net/socket/transport_client_socket_pool.h +++ b/net/socket/transport_client_socket_pool.h @@ -13,11 +13,11 @@ #include "base/time.h" #include "base/timer.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" -#include "net/base/single_request_host_resolver.h" +#include "net/dns/host_resolver.h" +#include "net/dns/single_request_host_resolver.h" +#include "net/socket/client_socket_pool.h" #include "net/socket/client_socket_pool_base.h" #include "net/socket/client_socket_pool_histograms.h" -#include "net/socket/client_socket_pool.h" namespace net { diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index 45b5485..ffea811 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -15,10 +15,10 @@ #include "net/base/ip_endpoint.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_handle.h" #include "net/socket/client_socket_pool_histograms.h" diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc index 73136ae..6bf9d28 100644 --- a/net/socket/transport_client_socket_unittest.cc +++ b/net/socket/transport_client_socket_unittest.cc @@ -9,13 +9,13 @@ #include "base/memory/scoped_ptr.h" #include "net/base/address_list.h" #include "net/base/io_buffer.h" -#include "net/base/mock_host_resolver.h" +#include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" -#include "net/base/net_errors.h" #include "net/base/tcp_listen_socket.h" #include "net/base/test_completion_callback.h" #include "net/base/winsock_init.h" +#include "net/dns/mock_host_resolver.h" #include "net/socket/client_socket_factory.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 8838bd3..0b1bc5c 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -20,10 +20,10 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "net/base/auth.h" -#include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "net/dns/host_resolver.h" #include "net/http/http_auth_controller.h" #include "net/http/http_network_session.h" #include "net/http/http_request_headers.h" diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index 8007767..ed3aa9b 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -12,10 +12,10 @@ #include "base/callback.h" #include "base/utf_string_conversions.h" #include "net/base/auth.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" #include "net/base/test_completion_callback.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_network_session.h" #include "net/proxy/proxy_service.h" #include "net/socket/socket_test_util.h" diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc index b98c9df..d6117ab 100644 --- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc +++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc @@ -11,22 +11,22 @@ #include "net/base/capturing_net_log.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" -#include "net/base/mock_host_resolver.h" #include "net/base/test_completion_callback.h" #include "net/base/winsock_init.h" -#include "net/http/http_response_info.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_response_headers.h" +#include "net/http/http_response_info.h" #include "net/socket/client_socket_factory.h" -#include "net/socket/tcp_client_socket.h" #include "net/socket/socket_test_util.h" +#include "net/socket/tcp_client_socket.h" #include "net/spdy/buffered_spdy_framer.h" #include "net/spdy/spdy_http_utils.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_test_util_common.h" #include "net/spdy/spdy_test_util_spdy2.h" -#include "testing/platform_test.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/platform_test.h" using namespace net::test_spdy2; diff --git a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc index 85db660..5dac149 100644 --- a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc +++ b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc @@ -11,22 +11,22 @@ #include "net/base/capturing_net_log.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" -#include "net/base/mock_host_resolver.h" #include "net/base/test_completion_callback.h" #include "net/base/winsock_init.h" -#include "net/http/http_response_info.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_response_headers.h" +#include "net/http/http_response_info.h" #include "net/socket/client_socket_factory.h" -#include "net/socket/tcp_client_socket.h" #include "net/socket/socket_test_util.h" +#include "net/socket/tcp_client_socket.h" #include "net/spdy/buffered_spdy_framer.h" #include "net/spdy/spdy_http_utils.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_test_util_common.h" #include "net/spdy/spdy_test_util_spdy3.h" -#include "testing/platform_test.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/platform_test.h" using namespace net::test_spdy3; diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h index 4d47b02..6054c38 100644 --- a/net/spdy/spdy_test_util_spdy2.h +++ b/net/spdy/spdy_test_util_spdy2.h @@ -10,8 +10,8 @@ #include "base/string_piece.h" #include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" -#include "net/base/mock_host_resolver.h" #include "net/base/request_priority.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h index dec5c05..27c8670 100644 --- a/net/spdy/spdy_test_util_spdy3.h +++ b/net/spdy/spdy_test_util_spdy3.h @@ -12,8 +12,8 @@ #include "crypto/ec_signature_creator.h" #include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" -#include "net/base/mock_host_resolver.h" #include "net/base/request_priority.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" diff --git a/net/test/base_test_server.cc b/net/test/base_test_server.cc index 39518e5..9500088e 100644 --- a/net/test/base_test_server.cc +++ b/net/test/base_test_server.cc @@ -16,12 +16,12 @@ #include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" #include "net/base/test_root_certs.h" +#include "net/dns/host_resolver.h" namespace net { diff --git a/net/test/net_test_suite.h b/net/test/net_test_suite.h index b2fed70..32e6b02b 100644 --- a/net/test/net_test_suite.h +++ b/net/test/net_test_suite.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/test/test_suite.h" #include "build/build_config.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" class MessageLoop; diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc index 7bb57a5..ef86826 100644 --- a/net/tools/fetch/fetch_client.cc +++ b/net/tools/fetch/fetch_client.cc @@ -15,10 +15,10 @@ #include "base/string_util.h" #include "net/base/cert_verifier.h" #include "net/base/completion_callback.h" -#include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/request_priority.h" +#include "net/dns/host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" diff --git a/net/tools/gdig/gdig.cc b/net/tools/gdig/gdig.cc index 55a8938..a818f01 100644 --- a/net/tools/gdig/gdig.cc +++ b/net/tools/gdig/gdig.cc @@ -19,7 +19,6 @@ #include "base/time.h" #include "net/base/address_list.h" #include "net/base/host_cache.h" -#include "net/base/host_resolver_impl.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -27,6 +26,7 @@ #include "net/dns/dns_client.h" #include "net/dns/dns_config_service.h" #include "net/dns/dns_protocol.h" +#include "net/dns/host_resolver_impl.h" #include "net/tools/gdig/file_net_log.h" #if defined(OS_MACOSX) diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc index 2bfe850..e860feb 100644 --- a/net/url_request/url_fetcher_impl_unittest.cc +++ b/net/url_request/url_fetcher_impl_unittest.cc @@ -15,8 +15,8 @@ #include "base/threading/thread.h" #include "build/build_config.h" #include "crypto/nss_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/network_change_notifier.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_response_headers.h" #include "net/test/test_server.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc index e88750b..d69d3e1 100644 --- a/net/url_request/url_request_context.cc +++ b/net/url_request/url_request_context.cc @@ -8,8 +8,8 @@ #include "base/debug/alias.h" #include "base/debug/stack_trace.h" #include "base/string_util.h" -#include "net/base/host_resolver.h" #include "net/cookies/cookie_store.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_transaction_factory.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/http_user_agent_settings.h" diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index 498e0ca..a84bc71 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -13,10 +13,10 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" #include "net/base/cert_verifier.h" -#include "net/base/host_resolver.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc index e201b8e..ae4140f 100644 --- a/net/url_request/url_request_context_storage.cc +++ b/net/url_request/url_request_context_storage.cc @@ -6,10 +6,10 @@ #include "base/logging.h" #include "net/base/cert_verifier.h" -#include "net/base/host_resolver.h" #include "net/base/net_log.h" #include "net/base/network_delegate.h" #include "net/cookies/cookie_store.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_transaction_factory.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_server_properties.h" diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc index e5c0051..5c72530 100644 --- a/net/url_request/url_request_test_util.cc +++ b/net/url_request/url_request_test_util.cc @@ -11,7 +11,7 @@ #include "base/threading/worker_pool.h" #include "net/base/cert_verifier.h" #include "net/base/host_port_pair.h" -#include "net/base/mock_host_resolver.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/ssl/default_server_bound_cert_store.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 32b99ac..ef98a65 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -33,7 +33,6 @@ #include "net/base/load_flags.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" @@ -47,6 +46,7 @@ #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store_test_helpers.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/mock_host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" diff --git a/net/websockets/websocket_job_spdy2_unittest.cc b/net/websockets/websocket_job_spdy2_unittest.cc index 0dde5231..5c46f57 100644 --- a/net/websockets/websocket_job_spdy2_unittest.cc +++ b/net/websockets/websocket_job_spdy2_unittest.cc @@ -15,11 +15,11 @@ #include "base/strings/string_split.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/cookies/cookie_store.h" #include "net/cookies/cookie_store_test_helpers.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_transaction_factory.h" #include "net/http/transport_security_state.h" #include "net/proxy/proxy_service.h" diff --git a/net/websockets/websocket_job_spdy3_unittest.cc b/net/websockets/websocket_job_spdy3_unittest.cc index 5877e94..1cf7573 100644 --- a/net/websockets/websocket_job_spdy3_unittest.cc +++ b/net/websockets/websocket_job_spdy3_unittest.cc @@ -15,11 +15,11 @@ #include "base/strings/string_split.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" -#include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/cookies/cookie_store.h" #include "net/cookies/cookie_store_test_helpers.h" +#include "net/dns/mock_host_resolver.h" #include "net/http/http_transaction_factory.h" #include "net/http/transport_security_state.h" #include "net/proxy/proxy_service.h" diff --git a/remoting/host/DEPS b/remoting/host/DEPS index 2f1aa54..4bca7ec 100644 --- a/remoting/host/DEPS +++ b/remoting/host/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+media/video/capture/screen", "+net/base", + "+net/dns", "+net/ftp", "+net/http", "+net/proxy", diff --git a/remoting/host/url_request_context.cc b/remoting/host/url_request_context.cc index aceccdb..26f7fdc 100644 --- a/remoting/host/url_request_context.cc +++ b/remoting/host/url_request_context.cc @@ -6,7 +6,7 @@ #include "base/message_loop_proxy.h" #include "net/base/cert_verifier.h" -#include "net/base/host_resolver.h" +#include "net/dns/host_resolver.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_layer.h" #include "net/http/http_network_session.h" diff --git a/sync/internal_api/http_bridge.cc b/sync/internal_api/http_bridge.cc index d163be5..df864bf 100644 --- a/sync/internal_api/http_bridge.cc +++ b/sync/internal_api/http_bridge.cc @@ -7,10 +7,10 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/string_number_conversions.h" -#include "net/base/host_resolver.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" #include "net/http/http_response_headers.h" diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index c773168..5fb0a0c 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -22,8 +22,8 @@ #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" #include "net/base/network_change_notifier.h" +#include "net/dns/host_resolver.h" #include "net/http/transport_security_state.h" #include "net/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index c863df3..834b040 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -17,8 +17,8 @@ #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" -#include "net/base/host_resolver.h" #include "net/base/network_change_notifier.h" +#include "net/dns/host_resolver.h" #include "net/http/transport_security_state.h" #include "net/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/webkit/DEPS b/webkit/DEPS index b760178..f5ae179 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -40,6 +40,7 @@ include_rules = [ "+crypto", "+net/base", "+net/cookies", + "+net/dns", "+net/ftp", "+net/http", "+net/proxy", diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index bfd2eb4d..5febc82 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -11,8 +11,8 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/worker_pool.h" #include "net/base/cert_verifier.h" -#include "net/base/host_resolver.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_network_session.h" |