Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1842)

Unified Diff: net/spdy/spdy_session_pool.cc

Issue 7492059: HostResolver: don't interpret NULL callback argument as a request to do synchronous resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged common code from Resolve and ResolveFromCache to a single function. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/spdy/spdy_session_pool.cc
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index c0a5194a78c3160c453d9ed18b1a45535a96250a..d90a1d51b5959948fe9e530228c47dc31cf7f9b5 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;
}
« net/base/host_resolver_impl.cc ('K') | « net/socket/socks_client_socket_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698