Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index f66d8f64648943f4fb5dd600c092b2f4e7293ac1..0b43937d133a63b09ae805581c43d41402ac1dce 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', |