diff options
author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-07 21:22:47 +0000 |
---|---|---|
committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-07 21:22:47 +0000 |
commit | e6652dec003b75acea1e7c51efafb5f2121e312d (patch) | |
tree | 08a18c02c448cd74df18d2ab60b0cfbc1e1f6100 /net/http/http_network_transaction_unittest.cc | |
parent | 60eba2eeb139f71141042254db2071f1148e03fc (diff) | |
download | chromium_src-e6652dec003b75acea1e7c51efafb5f2121e312d.zip chromium_src-e6652dec003b75acea1e7c51efafb5f2121e312d.tar.gz chromium_src-e6652dec003b75acea1e7c51efafb5f2121e312d.tar.bz2 |
Remove HostResolverImpl from Mock*HostResolver.
MockHostResolver should not depend on the job dispatch machinery of
HostResolverImpl. This implementation aims to be more readable/reliable
while providing the same testing utility.
MockHostResolver does not use extra threads hence cannot support
WaitingHostResolverProc. To mock slow resolution, HangingHostResolver is
provided for unit_tests:PredictorTest.
Updated host_resolver_impl_unittest to test HostResolverImpl directly
(rather than through MockHostResolver).
BUG=99889
TEST=./net_unittests ; ./unit_tests --gtest_filter='PredictorTest.*' ; ./jingle_unittests
Review URL: http://codereview.chromium.org/8267001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
-rw-r--r-- | net/http/http_network_transaction_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 7d4329e..329c0cc 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -20,6 +20,7 @@ #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/mock_host_resolver.h" #include "net/base/net_log.h" #include "net/base/net_log_unittest.h" @@ -9119,7 +9120,7 @@ class OneTimeCachingHostResolver : public net::HostResolver { const BoundNetLog& net_log) OVERRIDE { int rv = host_resolver_.ResolveFromCache(info, addresses, net_log); if (rv == OK && info.host_port_pair().Equals(host_port_)) - host_resolver_.Reset(NULL); + host_resolver_.GetHostCache()->clear(); return rv; } |