OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "net/dns/host_resolver.h" | 5 #include "net/dns/host_resolver.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/ptr_util.h" |
8 #include "base/metrics/field_trial.h" | 9 #include "base/metrics/field_trial.h" |
9 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
10 #include "base/strings/string_split.h" | 11 #include "base/strings/string_split.h" |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "net/base/net_errors.h" | 13 #include "net/base/net_errors.h" |
13 #include "net/dns/dns_client.h" | 14 #include "net/dns/dns_client.h" |
14 #include "net/dns/dns_config_service.h" | 15 #include "net/dns/dns_config_service.h" |
15 #include "net/dns/host_cache.h" | 16 #include "net/dns/host_cache.h" |
16 #include "net/dns/host_resolver_impl.h" | 17 #include "net/dns/host_resolver_impl.h" |
17 | 18 |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 } | 115 } |
115 | 116 |
116 std::unique_ptr<base::Value> HostResolver::GetDnsConfigAsValue() const { | 117 std::unique_ptr<base::Value> HostResolver::GetDnsConfigAsValue() const { |
117 return nullptr; | 118 return nullptr; |
118 } | 119 } |
119 | 120 |
120 // static | 121 // static |
121 std::unique_ptr<HostResolver> HostResolver::CreateSystemResolver( | 122 std::unique_ptr<HostResolver> HostResolver::CreateSystemResolver( |
122 const Options& options, | 123 const Options& options, |
123 NetLog* net_log) { | 124 NetLog* net_log) { |
124 return std::unique_ptr<HostResolver>(new HostResolverImpl(options, net_log)); | 125 return std::unique_ptr<HostResolver>( |
| 126 CreateSystemResolverImpl(options, net_log).release()); |
| 127 } |
| 128 |
| 129 // static |
| 130 std::unique_ptr<HostResolverImpl> HostResolver::CreateSystemResolverImpl( |
| 131 const Options& options, |
| 132 NetLog* net_log) { |
| 133 return base::WrapUnique(new HostResolverImpl(options, net_log)); |
125 } | 134 } |
126 | 135 |
127 // static | 136 // static |
128 std::unique_ptr<HostResolver> HostResolver::CreateDefaultResolver( | 137 std::unique_ptr<HostResolver> HostResolver::CreateDefaultResolver( |
129 NetLog* net_log) { | 138 NetLog* net_log) { |
130 return std::unique_ptr<HostResolver>( | 139 return CreateSystemResolver(Options(), net_log); |
131 new HostResolverImpl(Options(), net_log)); | |
132 } | 140 } |
133 | 141 |
134 HostResolver::HostResolver() { | 142 // static |
| 143 std::unique_ptr<HostResolverImpl> HostResolver::CreateDefaultResolverImpl( |
| 144 NetLog* net_log) { |
| 145 return CreateSystemResolverImpl(Options(), net_log); |
135 } | 146 } |
136 | 147 |
| 148 HostResolver::HostResolver() {} |
| 149 |
137 } // namespace net | 150 } // namespace net |
OLD | NEW |