summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_session_pool.cc
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 21:50:40 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 21:50:40 +0000
commit95a214cd9711f435d3c964df768d394163e5c353 (patch)
tree000931469e217e37f27a93342f30408350367127 /net/spdy/spdy_session_pool.cc
parent8e42ba22706ce8ca0fd374351f4221a26ebd5e0a (diff)
downloadchromium_src-95a214cd9711f435d3c964df768d394163e5c353.zip
chromium_src-95a214cd9711f435d3c964df768d394163e5c353.tar.gz
chromium_src-95a214cd9711f435d3c964df768d394163e5c353.tar.bz2
HostResolver: don't interpret NULL callback argument as a request to do synchronous resolution.
BUG=90547,60149 TEST=net_unittests Review URL: http://codereview.chromium.org/7492059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session_pool.cc')
-rw-r--r--net/spdy/spdy_session_pool.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index c0a5194..d90a1d5 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -342,12 +342,9 @@ void SpdySessionPool::RemoveSessionList(
bool SpdySessionPool::LookupAddresses(const HostPortProxyPair& pair,
AddressList* addresses) const {
net::HostResolver::RequestInfo resolve_info(pair.first);
- resolve_info.set_only_use_cached_response(true);
- int rv = resolver_->Resolve(resolve_info,
- addresses,
- NULL,
- NULL,
- net::BoundNetLog());
+ int rv = resolver_->ResolveFromCache(resolve_info,
+ addresses,
+ net::BoundNetLog());
DCHECK_NE(ERR_IO_PENDING, rv);
return rv == OK;
}