summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 15:33:09 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 15:33:09 +0000
commit98e1cd017db2ff2c610bec9a36803976f73a0fae (patch)
treee0796671aca7974b6a9afa9a8dd1755eef220f0e /net/http
parented0c0996fd4dbf49c1a74a611daabc8177d6d90e (diff)
downloadchromium_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/http')
-rw-r--r--net/http/http_network_transaction_unittest.cc3
-rw-r--r--net/http/http_stream_factory_impl_unittest.cc1
2 files changed, 3 insertions, 1 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index ceb6b9e..7c02e83 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"
@@ -9130,7 +9131,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;
}
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index dd08965..818049f 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -7,6 +7,7 @@
#include <string>
#include "base/basictypes.h"
+#include "net/base/capturing_net_log.h"
#include "net/base/cert_verifier.h"
#include "net/base/mock_host_resolver.h"
#include "net/base/net_log.h"