chromium/src
0
Fork 0
Code Activity

net: move host_resolver files from net/base to net/dns

Browse Source 
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
This commit is contained in:
phajdan.jr@chromium.org
2013-03-21 01:40:53 +00:00
parent b8512263f9
commit f2cb3cf86e
156 changed files with 222 additions and 220 deletions
chrome
browser
chrome_net_benchmarking_message_filter.cc
chromeos
app_mode
kiosk_app_manager_browsertest.cc
extensions
wallpaper_private_apitest.cc
extensions
activity_log_browsertest.cc
api
cloud_print_private
cloud_print_private_apitest.cc
dns
dns_api.hdns_apitest.cchost_resolver_wrapper.hmock_host_resolver_creator.cc
extension_action
script_badge_apitest.cc
history
history_apitest.cc
idle
idle_apitest.cc
page_capture
page_capture_apitest.cc
permissions
permissions_apitest.cc
push_messaging
push_messaging_canary_test.ccsync_setup_helper.h
socket
socket_api.hsocket_apitest.cc
web_navigation
web_navigation_apitest.cc
web_request
web_request_api_unittest.ccweb_request_apitest.cc
web_socket_proxy_private
web_socket_proxy_private_api.cc
webstore_private
webstore_private_apitest.cc
app_background_page_apitest.ccapp_process_apitest.ccchrome_app_api_browsertest.cccontent_script_apitest.cccontent_security_policy_apitest.cccross_origin_xhr_apitest.ccexecute_script_apitest.ccextension_context_menu_browsertest.ccextension_dom_clipboard_apitest.ccextension_icon_source_apitest.ccextension_incognito_apitest.ccextension_javascript_url_apitest.ccextension_nacl_browsertest.ccextension_resource_request_policy_apitest.ccextension_tabs_apitest.ccextension_websocket_apitest.ccisolated_app_browsertest.cclazy_background_page_apitest.ccprocess_management_browsertest.ccwebstore_startup_installer_browsertest.ccwindow_open_apitest.cc
intranet_redirect_detector.hio_thread.cc
net
connection_tester.ccconnection_tester_unittest.cccookie_policy_browsertest.ccnetwork_stats.hnetwork_stats_unittest.ccpredictor.ccpredictor_browsertest.ccpredictor_unittest.cc
policy
cloud
device_management_service.cc
prerender
prerender_browsertest.cc
rlz
rlz_extension_apitest.cc
safe_browsing
safe_browsing_test.cc
search_engines
template_url_scraper_unittest.cc
sync
test
integration
sync_test.h
task_manager
task_manager_browsertest.cc
ui
browser_browsertest.cc
login
login_prompt_browsertest.cc
omnibox
omnibox_view_browsertest.cc
search
instant_extended_manual_browsertest.cc
webui
net_internals
net_internals_ui.ccnet_internals_ui_browsertest.cc
common
extensions
extension_unittest.cc
service
net
service_url_request_context.ccservice_url_request_context.h
test
base
chrome_test_suite.ccin_process_browser_test.cc
perf
rendering
throughput_tests.cc
chrome_frame/test
test_server_test.cc
content
browser
renderer_host
p2p
socket_dispatcher_host.cc
pepper
pepper_host_resolver_private_message_filter.ccpepper_lookup_request.hpepper_tcp_socket.cc
shell
shell_url_request_context_getter.cc
jingle
glue
proxy_resolving_client_socket_unittest.cc
notifier
communicator
single_login_attempt_unittest.cc
net
dns
host_resolver.cchost_resolver.hhost_resolver_impl.cchost_resolver_impl.hhost_resolver_impl_unittest.cchost_resolver_proc.cchost_resolver_proc.hmapped_host_resolver.ccmapped_host_resolver.hmapped_host_resolver_unittest.ccmock_host_resolver.ccmock_host_resolver.hsingle_request_host_resolver.ccsingle_request_host_resolver.hsingle_request_host_resolver_unittest.cc
ftp
ftp_network_transaction.hftp_network_transaction_unittest.cc
http
http_auth_controller.cchttp_auth_handler_factory_unittest.cchttp_auth_handler_negotiate.cchttp_auth_handler_negotiate_unittest.cchttp_auth_unittest.cchttp_network_layer_unittest.cchttp_network_session.hhttp_network_transaction_spdy2_unittest.cchttp_network_transaction_spdy3_unittest.cchttp_pipelined_network_transaction_unittest.cchttp_stream_factory_impl_unittest.cc
net.gyp
proxy
proxy_resolver_perftest.ccproxy_resolver_v8_tracing.ccproxy_resolver_v8_tracing_unittest.ccproxy_script_fetcher_impl_unittest.cc
quic
quic_network_transaction_unittest.ccquic_stream_factory.ccquic_stream_factory_test.cc
socket
client_socket_pool.hsocks5_client_socket.hsocks5_client_socket_unittest.ccsocks_client_socket.hsocks_client_socket_pool.hsocks_client_socket_pool_unittest.ccsocks_client_socket_unittest.ccssl_client_socket_openssl_unittest.ccssl_client_socket_pool.hssl_client_socket_pool_unittest.ccssl_client_socket_unittest.cctransport_client_socket_pool.htransport_client_socket_pool_unittest.cctransport_client_socket_unittest.cc
socket_stream
socket_stream.ccsocket_stream_unittest.cc
spdy
spdy_proxy_client_socket_spdy2_unittest.ccspdy_proxy_client_socket_spdy3_unittest.ccspdy_test_util_spdy2.hspdy_test_util_spdy3.h
test
base_test_server.ccnet_test_suite.h
tools
fetch
fetch_client.cc
gdig
gdig.cc
url_request
url_fetcher_impl_unittest.ccurl_request_context.ccurl_request_context_builder.ccurl_request_context_storage.ccurl_request_test_util.ccurl_request_unittest.cc
websockets
websocket_job_spdy2_unittest.ccwebsocket_job_spdy3_unittest.cc
remoting/host
DEPSurl_request_context.cc
sync
internal_api
http_bridge.cc
tools
sync_client.ccsync_listen_notifications.cc
webkit
DEPS
tools
test_shell
test_shell_request_context.cc

2
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"

2
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 {

2
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");

2
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[] =

2
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"

2
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;

2
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;

2
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 {

2
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;

2
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"

2
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 {

2
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) {

4
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;

2
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;

2
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";

2
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;

2
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>

2
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;

4
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"

2
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"

2
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;

2
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"

2
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;

2
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;

2
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;

2
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;

2
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());

2
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());

2
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");

2
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:

2
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"

2
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 {

2
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:

2
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;

2
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) {

2
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;

2
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:

2
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)

2
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()));

2
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;

2
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;

2
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;

2
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;

2
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)

2
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;

4
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"

2
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"

2
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"

2
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;

2
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"

4
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"

4
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;

4
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;

2
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;

2
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"

2
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"

4
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)

2
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"

4
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 {

2
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"

2
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"

2
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"

2
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;

2
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"

2
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

2
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"

4
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

4
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;

2
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"

4
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 {

4
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"

4
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"

2
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"

2
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"

4
net/base/host_resolver.cc → 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 {

6
net/base/host_resolver.h → 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_

4
net/base/host_resolver_impl.cc → 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"

10
net/base/host_resolver_impl.h → 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_

4
net/base/host_resolver_impl_unittest.cc → 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 {

2
net/base/host_resolver_proc.cc → 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"

6
net/base/host_resolver_proc.h → 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_

2
net/base/mapped_host_resolver.cc → 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"

8
net/base/mapped_host_resolver.h → 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_

4
net/base/mapped_host_resolver_unittest.cc → 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 {

2
net/base/mock_host_resolver.cc → 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>

10
net/base/mock_host_resolver.h → 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_

2
net/base/single_request_host_resolver.cc → 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"

8
net/base/single_request_host_resolver.h → 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_

4
net/base/single_request_host_resolver_unittest.cc → 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 {

4
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"

2
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"

2
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"

2
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"

Some files were not shown because too many files have changed in this diff Show More