diff options
| -rw-r--r-- | chrome/browser/io_thread.cc | 2 | ||||
| -rw-r--r-- | net/base/host_resolver_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | net/base/test_host_resolver_observer.cc (renamed from net/base/dns_test_util.cc) | 44 | ||||
| -rw-r--r-- | net/base/test_host_resolver_observer.h | 73 | ||||
| -rw-r--r-- | net/dns/async_host_resolver.cc (renamed from net/base/async_host_resolver.cc) | 2 | ||||
| -rw-r--r-- | net/dns/async_host_resolver.h (renamed from net/base/async_host_resolver.h) | 9 | ||||
| -rw-r--r-- | net/dns/async_host_resolver_unittest.cc (renamed from net/base/async_host_resolver_unittest.cc) | 5 | ||||
| -rw-r--r-- | net/dns/dns_query.cc (renamed from net/base/dns_query.cc) | 5 | ||||
| -rw-r--r-- | net/dns/dns_query.h (renamed from net/base/dns_query.h) | 11 | ||||
| -rw-r--r-- | net/dns/dns_query_unittest.cc (renamed from net/base/dns_query_unittest.cc) | 3 | ||||
| -rw-r--r-- | net/dns/dns_response.cc (renamed from net/base/dns_response.cc) | 4 | ||||
| -rw-r--r-- | net/dns/dns_response.h (renamed from net/base/dns_response.h) | 12 | ||||
| -rw-r--r-- | net/dns/dns_response_unittest.cc (renamed from net/base/dns_response_unittest.cc) | 4 | ||||
| -rw-r--r-- | net/dns/dns_test_util.cc | 49 | ||||
| -rw-r--r-- | net/dns/dns_test_util.h (renamed from net/base/dns_test_util.h) | 63 | ||||
| -rw-r--r-- | net/dns/dns_transaction.cc (renamed from net/base/dns_transaction.cc) | 10 | ||||
| -rw-r--r-- | net/dns/dns_transaction.h (renamed from net/base/dns_transaction.h) | 16 | ||||
| -rw-r--r-- | net/dns/dns_transaction_unittest.cc (renamed from net/base/dns_transaction_unittest.cc) | 8 | ||||
| -rw-r--r-- | net/net.gyp | 30 |
19 files changed, 193 insertions, 159 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 35070e19..85c7e2a 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -34,7 +34,6 @@ #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h" #include "content/common/url_fetcher.h" -#include "net/base/async_host_resolver.h" #include "net/base/cert_verifier.h" #include "net/base/cookie_monster.h" #include "net/base/dnsrr_resolver.h" @@ -43,6 +42,7 @@ #include "net/base/host_resolver_impl.h" #include "net/base/mapped_host_resolver.h" #include "net/base/net_util.h" +#include "net/dns/async_host_resolver.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_filter.h" #include "net/http/http_auth_handler_factory.h" diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc index 73567d3..f89c38b 100644 --- a/net/base/host_resolver_impl_unittest.cc +++ b/net/base/host_resolver_impl_unittest.cc @@ -16,7 +16,6 @@ #include "base/time.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" -#include "net/base/dns_test_util.h" #include "net/base/host_cache.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" @@ -24,6 +23,7 @@ #include "net/base/net_util.h" #include "net/base/sys_addrinfo.h" #include "net/base/test_completion_callback.h" +#include "net/base/test_host_resolver_observer.h" #include "testing/gtest/include/gtest/gtest.h" // TODO(eroman): diff --git a/net/base/dns_test_util.cc b/net/base/test_host_resolver_observer.cc index d7f6803..6bd04ba 100644 --- a/net/base/dns_test_util.cc +++ b/net/base/test_host_resolver_observer.cc @@ -2,26 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/dns_test_util.h" - -#include "base/message_loop.h" +#include "net/base/test_host_resolver_observer.h" namespace net { -TestPrng::TestPrng(const std::deque<int>& numbers) : numbers_(numbers) { -} - -TestPrng::~TestPrng() { -} - -int TestPrng::GetNext(int min, int max) { - DCHECK(!numbers_.empty()); - int rv = numbers_.front(); - numbers_.pop_front(); - DCHECK(rv >= min && rv <= max); - return rv; -} - bool operator==(const HostResolver::RequestInfo& a, const HostResolver::RequestInfo& b) { return a.hostname() == b.hostname() && @@ -57,28 +41,4 @@ void TestHostResolverObserver::OnCancelResolution( cancel_log.push_back(StartOrCancelEntry(id, info)); } -bool ConvertStringsToIPAddressList( - const char* const ip_strings[], size_t size, IPAddressList* address_list) { - DCHECK(address_list); - IPAddressList ip_addresses; - for (size_t i = 0; i < size; ++i) { - IPAddressNumber ip; - if (!ParseIPLiteralToNumber(ip_strings[i], &ip)) - return false; - ip_addresses.push_back(ip); - } - address_list->swap(ip_addresses); - return true; -} - -bool CreateDnsAddress( - const char* ip_string, uint16 port, IPEndPoint* endpoint) { - DCHECK(endpoint); - IPAddressNumber ip_address; - if (!ParseIPLiteralToNumber(ip_string, &ip_address)) - return false; - *endpoint = IPEndPoint(ip_address, port); - return true; -} - -} // namespace net +} // namespace diff --git a/net/base/test_host_resolver_observer.h b/net/base/test_host_resolver_observer.h new file mode 100644 index 0000000..e5ac70a --- /dev/null +++ b/net/base/test_host_resolver_observer.h @@ -0,0 +1,73 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NET_BASE_TEST_HOST_RESOLVER_OBSERVER_H_ +#define NET_BASE_TEST_HOST_RESOLVER_OBSERVER_H_ +#pragma once + +#include "net/base/host_resolver.h" + +#include <vector> + +namespace net { + +bool operator==(const HostResolver::RequestInfo& a, + const HostResolver::RequestInfo& b); + +// Observer that just makes note of how it was called. The test code can then +// inspect to make sure it was called with the right parameters. Used by +// HostResolverImpl and AsyncHostResolver unit tests. +class TestHostResolverObserver : public HostResolver::Observer { + public: + TestHostResolverObserver(); + virtual ~TestHostResolverObserver(); + + // HostResolver::Observer methods: + virtual void OnStartResolution(int id, const HostResolver::RequestInfo& info); + virtual void OnFinishResolutionWithStatus( + int id, + bool was_resolved, + const HostResolver::RequestInfo& info); + virtual void OnCancelResolution( + int id, + const HostResolver::RequestInfo& info); + + // Tuple (id, info). + struct StartOrCancelEntry { + StartOrCancelEntry(int id, const HostResolver::RequestInfo& info) + : id(id), info(info) {} + + bool operator==(const StartOrCancelEntry& other) const { + return id == other.id && info == other.info; + } + + int id; + HostResolver::RequestInfo info; + }; + + // Tuple (id, was_resolved, info). + struct FinishEntry { + FinishEntry(int id, bool was_resolved, + const HostResolver::RequestInfo& info) + : id(id), was_resolved(was_resolved), info(info) {} + + bool operator==(const FinishEntry& other) const { + return id == other.id && + was_resolved == other.was_resolved && + info == other.info; + } + + int id; + bool was_resolved; + HostResolver::RequestInfo info; + }; + + std::vector<StartOrCancelEntry> start_log; + std::vector<FinishEntry> finish_log; + std::vector<StartOrCancelEntry> cancel_log; +}; + +} // namespace net + +#endif // NET_BASE_TEST_HOST_RESOLVER_OBSERVER_H_ diff --git a/net/base/async_host_resolver.cc b/net/dns/async_host_resolver.cc index 992767b..272e2b2 100644 --- a/net/base/async_host_resolver.cc +++ b/net/dns/async_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/async_host_resolver.h" +#include "net/dns/async_host_resolver.h" #include <algorithm> diff --git a/net/base/async_host_resolver.h b/net/dns/async_host_resolver.h index c14e700..d6feee3 100644 --- a/net/base/async_host_resolver.h +++ b/net/dns/async_host_resolver.h @@ -2,23 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_ASYNC_HOST_RESOLVER_H_ -#define NET_BASE_ASYNC_HOST_RESOLVER_H_ +#ifndef NET_DNS_ASYNC_HOST_RESOLVER_H_ +#define NET_DNS_ASYNC_HOST_RESOLVER_H_ #pragma once #include <list> #include <map> -#include <vector> #include "base/observer_list.h" #include "base/threading/non_thread_safe.h" #include "net/base/address_family.h" -#include "net/base/dns_transaction.h" #include "net/base/host_cache.h" #include "net/base/host_resolver.h" #include "net/base/ip_endpoint.h" #include "net/base/net_log.h" #include "net/base/rand_callback.h" +#include "net/dns/dns_transaction.h" namespace net { @@ -162,4 +161,4 @@ class NET_API AsyncHostResolver } // namespace net -#endif // NET_BASE_ASYNC_HOST_RESOLVER_H_ +#endif // NET_DNS_ASYNC_HOST_RESOLVER_H_ diff --git a/net/base/async_host_resolver_unittest.cc b/net/dns/async_host_resolver_unittest.cc index 8f1a396..d36b350 100644 --- a/net/base/async_host_resolver_unittest.cc +++ b/net/dns/async_host_resolver_unittest.cc @@ -2,15 +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/async_host_resolver.h" +#include "net/dns/async_host_resolver.h" #include "base/bind.h" #include "base/scoped_ptr.h" -#include "net/base/dns_test_util.h" #include "net/base/host_cache.h" #include "net/base/net_log.h" #include "net/base/rand_callback.h" #include "net/base/sys_addrinfo.h" +#include "net/base/test_host_resolver_observer.h" +#include "net/dns/dns_test_util.h" #include "net/socket/socket_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/dns_query.cc b/net/dns/dns_query.cc index 3c92e1d..788d653 100644 --- a/net/base/dns_query.cc +++ b/net/dns/dns_query.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/dns_query.h" +#include "net/dns/dns_query.h" #include <limits> -#include <string> -#include "base/rand_util.h" #include "net/base/dns_util.h" +#include "net/base/io_buffer.h" namespace net { diff --git a/net/base/dns_query.h b/net/dns/dns_query.h index ef1dae5..2628063 100644 --- a/net/base/dns_query.h +++ b/net/dns/dns_query.h @@ -2,19 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_DNS_QUERY_H_ -#define NET_BASE_DNS_QUERY_H_ +#ifndef NET_DNS_DNS_QUERY_H_ +#define NET_DNS_DNS_QUERY_H_ #pragma once #include <string> -#include "net/base/io_buffer.h" +#include "base/memory/ref_counted.h" #include "net/base/net_api.h" -#include "net/base/net_util.h" #include "net/base/rand_callback.h" namespace net { +class IOBufferWithSize; + // Represents on-the-wire DNS query message as an object. class NET_TEST DnsQuery { public: @@ -68,4 +69,4 @@ class NET_TEST DnsQuery { } // namespace net -#endif // NET_BASE_DNS_QUERY_H_ +#endif // NET_DNS_DNS_QUERY_H_ diff --git a/net/base/dns_query_unittest.cc b/net/dns/dns_query_unittest.cc index 796dcff..d43cf8be 100644 --- a/net/base/dns_query_unittest.cc +++ b/net/dns/dns_query_unittest.cc @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/dns_query.h" +#include "net/dns/dns_query.h" #include "base/bind.h" #include "base/rand_util.h" #include "net/base/dns_util.h" +#include "net/base/io_buffer.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/base/dns_response.cc b/net/dns/dns_response.cc index f7d88e1..3c5d605 100644 --- a/net/base/dns_response.cc +++ b/net/dns/dns_response.cc @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/dns_response.h" +#include "net/dns/dns_response.h" #include "net/base/dns_util.h" +#include "net/base/io_buffer.h" #include "net/base/net_errors.h" +#include "net/dns/dns_query.h" namespace net { diff --git a/net/base/dns_response.h b/net/dns/dns_response.h index d62f350..04a37d6 100644 --- a/net/base/dns_response.h +++ b/net/dns/dns_response.h @@ -2,15 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_DNS_RESPONSE_H_ -#define NET_BASE_DNS_RESPONSE_H_ +#ifndef NET_DNS_DNS_RESPONSE_H_ +#define NET_DNS_DNS_RESPONSE_H_ #pragma once -#include "net/base/dns_query.h" +#include "base/memory/ref_counted.h" #include "net/base/net_api.h" +#include "net/base/net_util.h" namespace net{ +class DnsQuery; +class IOBufferWithSize; + // Represents on-the-wire DNS response as an object; allows extracting // records. class NET_TEST DnsResponse { @@ -44,4 +48,4 @@ class NET_TEST DnsResponse { } // namespace net -#endif // NET_BASE_DNS_RESPONSE_H_ +#endif // NET_DNS_DNS_RESPONSE_H_ diff --git a/net/base/dns_response_unittest.cc b/net/dns/dns_response_unittest.cc index e7701b0..775cfc6 100644 --- a/net/base/dns_response_unittest.cc +++ b/net/dns/dns_response_unittest.cc @@ -2,12 +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/dns_response.h" +#include "net/dns/dns_response.h" #include "base/bind.h" #include "base/rand_util.h" #include "net/base/dns_util.h" #include "net/base/net_errors.h" +#include "net/base/io_buffer.h" +#include "net/dns/dns_query.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc new file mode 100644 index 0000000..ac63131 --- /dev/null +++ b/net/dns/dns_test_util.cc @@ -0,0 +1,49 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/dns/dns_test_util.h" + +#include "base/message_loop.h" + +namespace net { + +TestPrng::TestPrng(const std::deque<int>& numbers) : numbers_(numbers) { +} + +TestPrng::~TestPrng() { +} + +int TestPrng::GetNext(int min, int max) { + DCHECK(!numbers_.empty()); + int rv = numbers_.front(); + numbers_.pop_front(); + DCHECK(rv >= min && rv <= max); + return rv; +} + +bool ConvertStringsToIPAddressList( + const char* const ip_strings[], size_t size, IPAddressList* address_list) { + DCHECK(address_list); + IPAddressList ip_addresses; + for (size_t i = 0; i < size; ++i) { + IPAddressNumber ip; + if (!ParseIPLiteralToNumber(ip_strings[i], &ip)) + return false; + ip_addresses.push_back(ip); + } + address_list->swap(ip_addresses); + return true; +} + +bool CreateDnsAddress( + const char* ip_string, uint16 port, IPEndPoint* endpoint) { + DCHECK(endpoint); + IPAddressNumber ip_address; + if (!ParseIPLiteralToNumber(ip_string, &ip_address)) + return false; + *endpoint = IPEndPoint(ip_address, port); + return true; +} + +} // namespace net diff --git a/net/base/dns_test_util.h b/net/dns/dns_test_util.h index 04d8652..651cfcb 100644 --- a/net/base/dns_test_util.h +++ b/net/dns/dns_test_util.h @@ -2,15 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_DNS_TEST_UTIL_H_ -#define NET_BASE_DNS_TEST_UTIL_H_ +#ifndef NET_DNS_DNS_TEST_UTIL_H_ +#define NET_DNS_DNS_TEST_UTIL_H_ #pragma once #include <deque> #include <vector> #include "base/logging.h" -#include "net/base/dns_transaction.h" #include "net/base/dns_util.h" #include "net/base/host_resolver.h" #include "net/base/ip_endpoint.h" @@ -35,62 +34,6 @@ class TestPrng { DISALLOW_COPY_AND_ASSIGN(TestPrng); }; -bool operator==(const HostResolver::RequestInfo& a, - const HostResolver::RequestInfo& b); - -// Observer that just makes note of how it was called. The test code can then -// inspect to make sure it was called with the right parameters. Used by -// HostResolverImpl and AsyncHostResolver unit tests. -class TestHostResolverObserver : public HostResolver::Observer { - public: - TestHostResolverObserver(); - virtual ~TestHostResolverObserver(); - - // HostResolver::Observer methods: - virtual void OnStartResolution(int id, const HostResolver::RequestInfo& info); - virtual void OnFinishResolutionWithStatus( - int id, - bool was_resolved, - const HostResolver::RequestInfo& info); - virtual void OnCancelResolution( - int id, - const HostResolver::RequestInfo& info); - - // Tuple (id, info). - struct StartOrCancelEntry { - StartOrCancelEntry(int id, const HostResolver::RequestInfo& info) - : id(id), info(info) {} - - bool operator==(const StartOrCancelEntry& other) const { - return id == other.id && info == other.info; - } - - int id; - HostResolver::RequestInfo info; - }; - - // Tuple (id, was_resolved, info). - struct FinishEntry { - FinishEntry(int id, bool was_resolved, - const HostResolver::RequestInfo& info) - : id(id), was_resolved(was_resolved), info(info) {} - - bool operator==(const FinishEntry& other) const { - return id == other.id && - was_resolved == other.was_resolved && - info == other.info; - } - - int id; - bool was_resolved; - HostResolver::RequestInfo info; - }; - - std::vector<StartOrCancelEntry> start_log; - std::vector<FinishEntry> finish_log; - std::vector<StartOrCancelEntry> cancel_log; -}; - // A utility function for tests that given an array of IP literals, // converts it to an IPAddressList. bool ConvertStringsToIPAddressList( @@ -269,4 +212,4 @@ static const char* const kT3IpAddresses[] = { } // namespace net -#endif // NET_BASE_DNS_TEST_UTIL_H_ +#endif // NET_DNS_DNS_TEST_UTIL_H_ diff --git a/net/base/dns_transaction.cc b/net/dns/dns_transaction.cc index 84f123f..6e287c8 100644 --- a/net/base/dns_transaction.cc +++ b/net/dns/dns_transaction.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/dns_transaction.h" +#include "net/dns/dns_transaction.h" #include "base/bind.h" #include "base/rand_util.h" #include "base/values.h" -#include "net/base/completion_callback.h" -#include "net/base/dns_query.h" -#include "net/base/dns_response.h" #include "net/base/dns_util.h" -#include "net/base/rand_callback.h" +#include "net/base/io_buffer.h" +#include "net/base/net_errors.h" +#include "net/dns/dns_query.h" +#include "net/dns/dns_response.h" #include "net/socket/client_socket_factory.h" #include "net/udp/datagram_client_socket.h" diff --git a/net/base/dns_transaction.h b/net/dns/dns_transaction.h index 433bd242..eb09ece 100644 --- a/net/base/dns_transaction.h +++ b/net/dns/dns_transaction.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_DNS_TRANSACTION_H_ -#define NET_BASE_DNS_TRANSACTION_H_ +#ifndef NET_DNS_DNS_TRANSACTION_H_ +#define NET_DNS_DNS_TRANSACTION_H_ #pragma once #include <set> @@ -11,24 +11,22 @@ #include <utility> #include <vector> -#include "base/basictypes.h" +#include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" -#include "base/time.h" #include "base/timer.h" #include "base/threading/non_thread_safe.h" #include "net/base/completion_callback.h" -#include "net/base/dns_query.h" -#include "net/base/dns_response.h" -#include "net/base/dns_transaction.h" #include "net/base/ip_endpoint.h" #include "net/base/net_api.h" -#include "net/base/net_errors.h" #include "net/base/net_log.h" +#include "net/base/rand_callback.h" namespace net { class ClientSocketFactory; class DatagramClientSocket; +class DnsQuery; +class DnsResponse; // Performs (with fixed retries) a single asynchronous DNS transaction, // which consists of sending out a DNS query, waiting for response, and @@ -145,4 +143,4 @@ class NET_TEST DnsTransaction : NON_EXPORTED_BASE(public base::NonThreadSafe) { } // namespace net -#endif // NET_BASE_DNS_TRANSACTION_H_ +#endif // NET_DNS_DNS_TRANSACTION_H_ diff --git a/net/base/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index 2e557e9..a99f55b3 100644 --- a/net/base/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_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/dns/dns_transaction.h" + +#include <deque> #include <vector> #include "base/bind.h" -#include "base/rand_util.h" -#include "net/base/dns_transaction.h" -#include "net/base/dns_query.h" -#include "net/base/dns_test_util.h" +#include "net/dns/dns_test_util.h" #include "net/socket/socket_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/net.gyp b/net/net.gyp index 12cfe91..949266b 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -31,8 +31,6 @@ 'base/address_list_net_log_param.h', 'base/asn1_util.cc', 'base/asn1_util.h', - 'base/async_host_resolver.cc', - 'base/async_host_resolver.h', 'base/auth.cc', 'base/auth.h', 'base/backoff_entry.cc', @@ -71,12 +69,6 @@ 'base/data_url.h', 'base/directory_lister.cc', 'base/directory_lister.h', - 'base/dns_query.cc', - 'base/dns_query.h', - 'base/dns_response.cc', - 'base/dns_response.h', - 'base/dns_transaction.cc', - 'base/dns_transaction.h', 'base/dns_reload_timer.cc', 'base/dns_reload_timer.h', 'base/dnssec_chain_verifier.cc', @@ -295,6 +287,14 @@ 'disk_cache/storage_block.h', 'disk_cache/trace.cc', 'disk_cache/trace.h', + 'dns/async_host_resolver.cc', + 'dns/async_host_resolver.h', + 'dns/dns_query.cc', + 'dns/dns_query.h', + 'dns/dns_response.cc', + 'dns/dns_response.h', + 'dns/dns_transaction.cc', + 'dns/dns_transaction.h', 'ftp/ftp_auth_cache.cc', 'ftp/ftp_auth_cache.h', 'ftp/ftp_ctrl_response_buffer.cc', @@ -874,7 +874,6 @@ ], 'sources': [ 'base/address_list_unittest.cc', - 'base/async_host_resolver_unittest.cc', 'base/backoff_entry_unittest.cc', 'base/cert_database_nss_unittest.cc', 'base/cert_verifier_unittest.cc', @@ -882,9 +881,6 @@ 'base/crl_filter_unittest.cc', 'base/data_url_unittest.cc', 'base/directory_lister_unittest.cc', - 'base/dns_query_unittest.cc', - 'base/dns_response_unittest.cc', - 'base/dns_transaction_unittest.cc', 'base/dnssec_unittest.cc', 'base/dns_util_unittest.cc', 'base/dnsrr_resolver_unittest.cc', @@ -933,6 +929,10 @@ 'disk_cache/entry_unittest.cc', 'disk_cache/mapped_file_unittest.cc', 'disk_cache/storage_block_unittest.cc', + 'dns/async_host_resolver_unittest.cc', + 'dns/dns_query_unittest.cc', + 'dns/dns_response_unittest.cc', + 'dns/dns_transaction_unittest.cc', 'ftp/ftp_auth_cache_unittest.cc', 'ftp/ftp_ctrl_response_buffer_unittest.cc', 'ftp/ftp_directory_listing_parser_ls_unittest.cc', @@ -1189,14 +1189,16 @@ 'base/cert_test_util.h', 'base/cookie_monster_store_test.cc', 'base/cookie_monster_store_test.h', - 'base/dns_test_util.cc', - 'base/dns_test_util.h', 'base/net_test_suite.cc', 'base/net_test_suite.h', 'base/test_completion_callback.cc', 'base/test_completion_callback.h', + 'base/test_host_resolver_observer.cc', + 'base/test_host_resolver_observer.h', 'disk_cache/disk_cache_test_util.cc', 'disk_cache/disk_cache_test_util.h', + 'dns/dns_test_util.cc', + 'dns/dns_test_util.h', 'proxy/mock_proxy_resolver.cc', 'proxy/mock_proxy_resolver.h', 'proxy/mock_proxy_script_fetcher.cc', |