summaryrefslogtreecommitdiffstats
path: root/net/base/mock_host_resolver.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 17:40:06 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 17:40:06 +0000
commit80a09a86b207711a4009852db8c2567ec3ff8efd (patch)
tree1d9e67e894c49cc38657c1813eea4df917a816ef /net/base/mock_host_resolver.cc
parent6bfd2823f21ec0c327fe927739c204f86d9248cb (diff)
downloadchromium_src-80a09a86b207711a4009852db8c2567ec3ff8efd.zip
chromium_src-80a09a86b207711a4009852db8c2567ec3ff8efd.tar.gz
chromium_src-80a09a86b207711a4009852db8c2567ec3ff8efd.tar.bz2
net: Pass the real IP address and port for mock TCP sockets where possible.
I'll need that for my upcoming FTP CL. BUG=131847 Review URL: https://codereview.chromium.org/11280014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mock_host_resolver.cc')
-rw-r--r--net/base/mock_host_resolver.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index 7dde629..d86e209 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -121,7 +121,6 @@ HostCache* MockHostResolverBase::GetHostCache() {
MockHostResolverBase::MockHostResolverBase(bool use_caching)
: synchronous_mode_(false), next_request_id_(1) {
rules_ = CreateCatchAllHostResolverProc();
- proc_ = rules_;
if (use_caching) {
cache_.reset(new HostCache(kMaxCacheEntries));
@@ -156,11 +155,11 @@ int MockHostResolverBase::ResolveProc(size_t id,
const RequestInfo& info,
AddressList* addresses) {
AddressList addr;
- int rv = proc_->Resolve(info.hostname(),
- info.address_family(),
- info.host_resolver_flags(),
- &addr,
- NULL);
+ int rv = rules_->Resolve(info.hostname(),
+ info.address_family(),
+ info.host_resolver_flags(),
+ &addr,
+ NULL);
if (cache_.get()) {
HostCache::Key key(info.hostname(),
info.address_family(),