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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/dns/host_resolver_wrapper.h" 5 #include "extensions/browser/api/dns/host_resolver_wrapper.h"
6 6
7 #include "content/public/browser/resource_context.h"
8 #include "net/dns/host_resolver.h"
9
7 namespace extensions { 10 namespace extensions {
8 11
9 HostResolverWrapper::HostResolverWrapper() : resolver_(NULL) {} 12 HostResolverWrapper::HostResolverWrapper() : resolver_(NULL) {}
10 13
11 // static 14 // static
12 HostResolverWrapper* HostResolverWrapper::GetInstance() { 15 HostResolverWrapper* HostResolverWrapper::GetInstance() {
13 return Singleton<extensions::HostResolverWrapper>::get(); 16 return Singleton<extensions::HostResolverWrapper>::get();
14 } 17 }
15 18
16 net::HostResolver* HostResolverWrapper::GetHostResolver( 19 net::HostResolver* HostResolverWrapper::GetHostResolver(
17 net::HostResolver* real_resolver) { 20 content::ResourceContext* context) {
18 return resolver_ ? resolver_ : real_resolver; 21 return resolver_ ? resolver_ : context->GetHostResolver();
19 } 22 }
20 23
21 void HostResolverWrapper::SetHostResolverForTesting( 24 void HostResolverWrapper::SetHostResolverForTesting(
22 net::HostResolver* mock_resolver) { 25 net::HostResolver* mock_resolver) {
23 resolver_ = mock_resolver; 26 resolver_ = mock_resolver;
24 } 27 }
25 28
26 } // namespace extensions 29 } // namespace extensions
OLDNEW
« 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