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

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

Issue 394103004: Move DnsApiTest.DnsResolveIPLiteral and DnsApiTest.DnsResolveHostname to app_shell_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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.h
diff --git a/extensions/browser/api/dns/host_resolver_wrapper.h b/extensions/browser/api/dns/host_resolver_wrapper.h
index 4eb4282120a6fea1c9af37fa365dd385fcc0f858..89511e4f5ac9081f1a61ec2eb34bca3f35348a2a 100644
--- a/extensions/browser/api/dns/host_resolver_wrapper.h
+++ b/extensions/browser/api/dns/host_resolver_wrapper.h
@@ -6,7 +6,14 @@
#define EXTENSIONS_BROWSER_API_DNS_HOST_RESOLVER_WRAPPER_H_
#include "base/memory/singleton.h"
-#include "net/dns/host_resolver.h"
+
+namespace content {
+class ResourceContext;
+}
+
+namespace net {
+class HostResolver;
+}
namespace extensions {
@@ -23,11 +30,10 @@ class HostResolverWrapper {
public:
static HostResolverWrapper* GetInstance();
- // Given a pointer to a real host resolver, returns the same pointer or else
- // a substitute MockHostResolver to use instead. If
- // SetHostResolverForTesting() hasn't been called, then this method returns
- // the supplied argument as its result.
- net::HostResolver* GetHostResolver(net::HostResolver* real_resolver);
+ // Given a pointer to a ResourceContext, returns its HostResolver if
+ // SetHostResolverForTesting() hasn't been called, or else a
+ // a substitute MockHostResolver to use instead.
+ net::HostResolver* GetHostResolver(content::ResourceContext* context);
// Sets the MockHostResolver to return in GetHostResolver().
void SetHostResolverForTesting(net::HostResolver* mock_resolver);

Powered by Google App Engine
This is Rietveld 408576698