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

Unified Diff: net/base/mock_host_resolver.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/base/mock_host_resolver.cc
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index f822bdea0b76b1e9b49aa505364764a5668fc29b..6b2aa4c5c4516bb315d14351ee9638a342950246 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -112,6 +112,12 @@ int MockHostResolverBase::Resolve(const RequestInfo& info,
return impl_->Resolve(info, addresses, callback, out_req, net_log);
}
+int MockHostResolverBase::ResolveFromCache(const RequestInfo& info,
+ AddressList* addresses,
+ const BoundNetLog& net_log) {
+ return impl_->ResolveFromCache(info, addresses, net_log);
+}
+
void MockHostResolverBase::CancelRequest(RequestHandle req) {
impl_->CancelRequest(req);
}

Powered by Google App Engine
This is Rietveld 408576698