diff options
19 files changed, 24 insertions, 23 deletions
diff --git a/chrome/browser/chrome_net_benchmarking_message_filter.cc b/chrome/browser/chrome_net_benchmarking_message_filter.cc index f98e9c3..4ad3fc7 100644 --- a/chrome/browser/chrome_net_benchmarking_message_filter.cc +++ b/chrome/browser/chrome_net_benchmarking_message_filter.cc @@ -13,9 +13,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/benchmarking_messages.h" #include "chrome/common/chrome_switches.h" -#include "net/base/host_cache.h" #include "net/base/net_errors.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/host_cache.h" #include "net/dns/host_resolver.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index eb98b46..503d303 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -40,12 +40,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" -#include "net/base/host_cache.h" #include "net/base/host_mapping_rules.h" #include "net/base/net_util.h" #include "net/base/sdch_manager.h" #include "net/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" +#include "net/dns/host_cache.h" #include "net/dns/host_resolver.h" #include "net/dns/mapped_host_resolver.h" #include "net/ftp/ftp_network_layer.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 0ac1324..a850cbb 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -56,10 +56,10 @@ #include "content/public/browser/web_ui_message_handler.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" -#include "net/base/host_cache.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/disk_cache/disk_cache.h" +#include "net/dns/host_cache.h" #include "net/dns/host_resolver.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 9672637..c892a35 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -22,8 +22,8 @@ #include "content/public/browser/web_ui_message_handler.h" #include "googleurl/src/gurl.h" #include "net/base/address_list.h" -#include "net/base/host_cache.h" #include "net/base/net_errors.h" +#include "net/dns/host_cache.h" #include "net/dns/host_resolver.h" #include "net/dns/host_resolver_proc.h" #include "net/http/http_network_session.h" diff --git a/net/base/host_cache.cc b/net/dns/host_cache.cc index 32f8c44..9c45bad 100644 --- a/net/base/host_cache.cc +++ b/net/dns/host_cache.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_cache.h" +#include "net/dns/host_cache.h" #include "base/logging.h" #include "base/metrics/field_trial.h" diff --git a/net/base/host_cache.h b/net/dns/host_cache.h index c4b248b..9b3f719 100644 --- a/net/base/host_cache.h +++ b/net/dns/host_cache.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_CACHE_H_ -#define NET_BASE_HOST_CACHE_H_ +#ifndef NET_DNS_HOST_CACHE_H_ +#define NET_DNS_HOST_CACHE_H_ #include <functional> #include <string> @@ -121,4 +121,4 @@ class NET_EXPORT HostCache : NON_EXPORTED_BASE(public base::NonThreadSafe) { } // namespace net -#endif // NET_BASE_HOST_CACHE_H_ +#endif // NET_DNS_HOST_CACHE_H_ diff --git a/net/base/host_cache_unittest.cc b/net/dns/host_cache_unittest.cc index d71e061..d59098c 100644 --- a/net/base/host_cache_unittest.cc +++ b/net/dns/host_cache_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_cache.h" +#include "net/dns/host_cache.h" #include "base/format_macros.h" #include "base/stl_util.h" diff --git a/net/dns/host_resolver.cc b/net/dns/host_resolver.cc index 6350d2e..3b680b7 100644 --- a/net/dns/host_resolver.cc +++ b/net/dns/host_resolver.cc @@ -8,9 +8,9 @@ #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/dns/dns_client.h" #include "net/dns/dns_config_service.h" +#include "net/dns/host_cache.h" #include "net/dns/host_resolver_impl.h" namespace net { diff --git a/net/dns/host_resolver_impl.h b/net/dns/host_resolver_impl.h index 2519d13..9d1be0b 100644 --- a/net/dns/host_resolver_impl.h +++ b/net/dns/host_resolver_impl.h @@ -15,10 +15,10 @@ #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "net/base/capturing_net_log.h" -#include "net/base/host_cache.h" #include "net/base/net_export.h" #include "net/base/network_change_notifier.h" #include "net/base/prioritized_dispatcher.h" +#include "net/dns/host_cache.h" #include "net/dns/host_resolver.h" #include "net/dns/host_resolver_proc.h" diff --git a/net/dns/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc index 26bebeb..8fc6280 100644 --- a/net/dns/host_resolver_impl_unittest.cc +++ b/net/dns/host_resolver_impl_unittest.cc @@ -19,11 +19,11 @@ #include "base/test/test_timeouts.h" #include "base/time.h" #include "net/base/address_list.h" -#include "net/base/host_cache.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/host_cache.h" #include "net/dns/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc index e6ecf59..e549833 100644 --- a/net/dns/mock_host_resolver.cc +++ b/net/dns/mock_host_resolver.cc @@ -14,10 +14,11 @@ #include "base/string_util.h" #include "base/strings/string_split.h" #include "base/threading/platform_thread.h" -#include "net/base/host_cache.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" +#include "net/dns/host_cache.h" + #if defined(OS_WIN) #include "net/base/winsock_init.h" #endif diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index 0da9f2e..ab5ddf8 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -21,7 +21,6 @@ #include "net/base/auth.h" #include "net/base/capturing_net_log.h" #include "net/base/completion_callback.h" -#include "net/base/host_cache.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/net_log.h" @@ -33,6 +32,7 @@ #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" #include "net/cert/mock_cert_verifier.h" +#include "net/dns/host_cache.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_digest.h" #include "net/http/http_auth_handler_mock.h" diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index 8a90c7b..9a930da 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -21,7 +21,6 @@ #include "net/base/auth.h" #include "net/base/capturing_net_log.h" #include "net/base/completion_callback.h" -#include "net/base/host_cache.h" #include "net/base/load_timing_info.h" #include "net/base/load_timing_info_test_util.h" #include "net/base/net_log.h" @@ -33,6 +32,7 @@ #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" #include "net/cert/mock_cert_verifier.h" +#include "net/dns/host_cache.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_digest.h" #include "net/http/http_auth_handler_mock.h" diff --git a/net/http/http_pipelined_network_transaction_unittest.cc b/net/http/http_pipelined_network_transaction_unittest.cc index d13c31e..8fb1e55 100644 --- a/net/http/http_pipelined_network_transaction_unittest.cc +++ b/net/http/http_pipelined_network_transaction_unittest.cc @@ -10,11 +10,11 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "net/base/address_list.h" -#include "net/base/host_cache.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/request_priority.h" +#include "net/dns/host_cache.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_auth_handler_mock.h" #include "net/http/http_network_session.h" diff --git a/net/net.gyp b/net/net.gyp index dc0ab80..0a9ee67 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -131,8 +131,6 @@ 'base/gzip_header.h', 'base/hash_value.cc', 'base/hash_value.h', - 'base/host_cache.cc', - 'base/host_cache.h', 'base/host_mapping_rules.cc', 'base/host_mapping_rules.h', 'base/host_port_pair.cc', @@ -423,6 +421,8 @@ 'dns/dns_socket_pool.h', 'dns/dns_transaction.cc', 'dns/dns_transaction.h', + 'dns/host_cache.cc', + 'dns/host_cache.h', 'dns/host_resolver.cc', 'dns/host_resolver.h', 'dns/host_resolver_impl.cc', @@ -1395,7 +1395,6 @@ 'base/filter_unittest.cc', 'base/int128_unittest.cc', 'base/gzip_filter_unittest.cc', - 'base/host_cache_unittest.cc', 'base/host_mapping_rules_unittest.cc', 'base/host_port_pair_unittest.cc', 'base/ip_endpoint_unittest.cc', @@ -1457,6 +1456,7 @@ 'dns/dns_response_unittest.cc', 'dns/dns_session_unittest.cc', 'dns/dns_transaction_unittest.cc', + 'dns/host_cache_unittest.cc', 'dns/host_resolver_impl_unittest.cc', 'dns/mapped_host_resolver_unittest.cc', 'dns/serial_worker_unittest.cc', diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc index 5e0e108..2c5ee2b 100644 --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc @@ -15,11 +15,11 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "googleurl/src/gurl.h" -#include "net/base/host_cache.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/host_cache.h" #include "net/dns/mock_host_resolver.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_error_observer.h" diff --git a/net/spdy/spdy_session_spdy2_unittest.cc b/net/spdy/spdy_session_spdy2_unittest.cc index 1d7026f..e58f736 100644 --- a/net/spdy/spdy_session_spdy2_unittest.cc +++ b/net/spdy/spdy_session_spdy2_unittest.cc @@ -4,11 +4,11 @@ #include "net/spdy/spdy_session.h" -#include "net/base/host_cache.h" #include "net/base/ip_endpoint.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" #include "net/base/test_data_directory.h" +#include "net/dns/host_cache.h" #include "net/spdy/spdy_io_buffer.h" #include "net/spdy/spdy_session_pool.h" #include "net/spdy/spdy_stream.h" diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc index eaf23ffe..9eacd66 100644 --- a/net/spdy/spdy_session_spdy3_unittest.cc +++ b/net/spdy/spdy_session_spdy3_unittest.cc @@ -4,11 +4,11 @@ #include "net/spdy/spdy_session.h" -#include "net/base/host_cache.h" #include "net/base/ip_endpoint.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" #include "net/base/test_data_directory.h" +#include "net/dns/host_cache.h" #include "net/spdy/spdy_http_utils.h" #include "net/spdy/spdy_io_buffer.h" #include "net/spdy/spdy_session_pool.h" diff --git a/net/tools/gdig/gdig.cc b/net/tools/gdig/gdig.cc index a818f01..2601942 100644 --- a/net/tools/gdig/gdig.cc +++ b/net/tools/gdig/gdig.cc @@ -18,7 +18,6 @@ #include "base/strings/string_split.h" #include "base/time.h" #include "net/base/address_list.h" -#include "net/base/host_cache.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -26,6 +25,7 @@ #include "net/dns/dns_client.h" #include "net/dns/dns_config_service.h" #include "net/dns/dns_protocol.h" +#include "net/dns/host_cache.h" #include "net/dns/host_resolver_impl.h" #include "net/tools/gdig/file_net_log.h" |