diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 15:33:09 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 15:33:09 +0000 |
| commit | 98e1cd017db2ff2c610bec9a36803976f73a0fae (patch) | |
| tree | e0796671aca7974b6a9afa9a8dd1755eef220f0e /net/proxy | |
| parent | ed0c0996fd4dbf49c1a74a611daabc8177d6d90e (diff) | |
| download | chromium_src-98e1cd017db2ff2c610bec9a36803976f73a0fae.zip chromium_src-98e1cd017db2ff2c610bec9a36803976f73a0fae.tar.gz chromium_src-98e1cd017db2ff2c610bec9a36803976f73a0fae.tar.bz2 | |
Remove HostResolverImpl from Mock*HostResolver.
Original review: http://codereview.chromium.org/8267001/
TBR=rvargas
BUG=99889
TEST=Green tree: ./net_unittests ; ./unit_tests --gtest_filter='PredictorTest.*' ; ./jingle_unittests
Review URL: http://codereview.chromium.org/8491024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_resolver_js_bindings_unittest.cc | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/net/proxy/proxy_resolver_js_bindings_unittest.cc b/net/proxy/proxy_resolver_js_bindings_unittest.cc index 1c580b9..e4fa389 100644 --- a/net/proxy/proxy_resolver_js_bindings_unittest.cc +++ b/net/proxy/proxy_resolver_js_bindings_unittest.cc @@ -8,6 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.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_log.h" @@ -33,40 +34,14 @@ class MockHostResolverWithMultipleResults : public SyncHostResolver { // HostResolver methods: virtual int Resolve(const HostResolver::RequestInfo& info, AddressList* addresses) OVERRIDE { - // Build up the result list (in reverse). - AddressList temp_list = ResolveIPLiteral("200.100.1.2"); - temp_list = PrependAddressToList("172.22.34.1", temp_list); - temp_list = PrependAddressToList("192.168.1.1", temp_list); - *addresses = temp_list; - return OK; + return ParseAddressList("192.168.1.1,172.22.34.1,200.100.1.2", "", + addresses); } virtual void Shutdown() OVERRIDE {} private: virtual ~MockHostResolverWithMultipleResults() {} - - // Resolves an IP literal to an address list. - AddressList ResolveIPLiteral(const char* ip_literal) { - AddressList result; - int rv = SystemHostResolverProc(ip_literal, - ADDRESS_FAMILY_UNSPECIFIED, - 0, - &result, NULL); - EXPECT_EQ(OK, rv); - EXPECT_EQ(NULL, result.head()->ai_next); - return result; - } - - // Builds an AddressList that is |ip_literal| + |orig_list|. - // |orig_list| must not be empty. - AddressList PrependAddressToList(const char* ip_literal, - const AddressList& orig_list) { - // Build an addrinfo for |ip_literal|. - AddressList result = ResolveIPLiteral(ip_literal); - result.Append(orig_list.head()); - return result; - } }; class MockFailingHostResolver : public SyncHostResolver { |