diff options
Diffstat (limited to 'net')
68 files changed, 121 insertions, 121 deletions
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" |