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

Unified Diff: extensions/browser/api/dns/host_resolver_wrapper.cc

Issue 394103004: Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: correcter gyp Created 6 years, 5 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: extensions/browser/api/dns/host_resolver_wrapper.cc
diff --git a/extensions/browser/api/dns/host_resolver_wrapper.cc b/extensions/browser/api/dns/host_resolver_wrapper.cc
index f97a9c747b4fc74dbd3d33d7f084c41d63eb9068..4a9b44ed6af9c23722e22b1a76a673d332e51bc1 100644
--- a/extensions/browser/api/dns/host_resolver_wrapper.cc
+++ b/extensions/browser/api/dns/host_resolver_wrapper.cc
@@ -4,6 +4,9 @@
#include "extensions/browser/api/dns/host_resolver_wrapper.h"
+#include "content/public/browser/resource_context.h"
+#include "net/dns/host_resolver.h"
+
namespace extensions {
HostResolverWrapper::HostResolverWrapper() : resolver_(NULL) {}
@@ -14,8 +17,8 @@ HostResolverWrapper* HostResolverWrapper::GetInstance() {
}
net::HostResolver* HostResolverWrapper::GetHostResolver(
- net::HostResolver* real_resolver) {
- return resolver_ ? resolver_ : real_resolver;
+ content::ResourceContext* context) {
+ return resolver_ ? resolver_ : context->GetHostResolver();
}
void HostResolverWrapper::SetHostResolverForTesting(
« no previous file with comments | « extensions/browser/api/dns/host_resolver_wrapper.h ('k') | extensions/browser/api/dns/mock_host_resolver_creator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698