Index: net/dns/host_resolver.cc |
diff --git a/net/dns/host_resolver.cc b/net/dns/host_resolver.cc |
index be393b047e433495cd453cbe02c6c7bb55bbfcb9..426ee72cce13a05f7520614be4b04298b7d4e5d2 100644 |
--- a/net/dns/host_resolver.cc |
+++ b/net/dns/host_resolver.cc |
@@ -5,6 +5,7 @@ |
#include "net/dns/host_resolver.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/metrics/field_trial.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_split.h" |
@@ -118,20 +119,32 @@ std::unique_ptr<base::Value> HostResolver::GetDnsConfigAsValue() const { |
} |
// static |
-std::unique_ptr<HostResolver> HostResolver::CreateSystemResolver( |
+std::unique_ptr<HostResolverImpl> HostResolver::CreateSystemResolverImpl( |
const Options& options, |
NetLog* net_log) { |
- return std::unique_ptr<HostResolver>(new HostResolverImpl(options, net_log)); |
+ return base::WrapUnique(new HostResolverImpl(options, net_log)); |
} |
// static |
-std::unique_ptr<HostResolver> HostResolver::CreateDefaultResolver( |
+std::unique_ptr<HostResolverImpl> HostResolver::CreateDefaultResolverImpl( |
+ NetLog* net_log) { |
+ return CreateSystemResolverImpl(Options(), net_log); |
+} |
Ryan Sleevi
2016/06/21 01:25:53
STYLE: Match declaration and definition order (e.g
Julia Tuttle
2016/07/18 18:43:32
Done.
|
+ |
+// static |
+std::unique_ptr<HostResolver> HostResolver::CreateSystemResolver( |
+ const Options& options, |
NetLog* net_log) { |
return std::unique_ptr<HostResolver>( |
- new HostResolverImpl(Options(), net_log)); |
+ CreateSystemResolverImpl(options, net_log).release()); |
} |
-HostResolver::HostResolver() { |
+// static |
+std::unique_ptr<HostResolver> HostResolver::CreateDefaultResolver( |
+ NetLog* net_log) { |
+ return CreateSystemResolver(Options(), net_log); |
} |
+HostResolver::HostResolver() {} |
+ |
} // namespace net |