1 files changed, 38 insertions, 11 deletions
diff --git a/chromium/net/dns/host_resolver.cc b/chromium/net/dns/host_resolver.cc
index be393b047e4..df958933d79 100644
--- a/chromium/net/dns/host_resolver.cc
+++ b/chromium/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"
@@ -91,8 +92,23 @@ HostResolver::Options::Options()
 }
 
 HostResolver::RequestInfo::RequestInfo(const HostPortPair& host_port_pair)
-    : host_port_pair_(host_port_pair),
-      address_family_(ADDRESS_FAMILY_UNSPECIFIED),
+    : RequestInfo() {
+  host_port_pair_ = host_port_pair;
+}
+
+HostResolver::RequestInfo::RequestInfo(const RequestInfo& request_info)
+    : host_port_pair_(request_info.host_port_pair_),
+      address_family_(request_info.address_family_),
+      host_resolver_flags_(request_info.host_resolver_flags_),
+      allow_cached_response_(request_info.allow_cached_response_),
+      is_speculative_(request_info.is_speculative_),
+      is_my_ip_address_(request_info.is_my_ip_address_),
+      cache_hit_callback_(request_info.cache_hit_callback_) {}
+
+HostResolver::RequestInfo::~RequestInfo() {}
+
+HostResolver::RequestInfo::RequestInfo()
+    : address_family_(ADDRESS_FAMILY_UNSPECIFIED),
       host_resolver_flags_(0),
       allow_cached_response_(true),
       is_speculative_(false),
@@ -104,11 +120,6 @@ HostResolver::~HostResolver() {
 void HostResolver::SetDnsClientEnabled(bool enabled) {
 }
 
-void HostResolver::ChangeRequestPriority(RequestHandle req,
-                                         RequestPriority priority) {
-  NOTIMPLEMENTED();
-}
-
 HostCache* HostResolver::GetHostCache() {
   return nullptr;
 }
@@ -117,21 +128,37 @@ std::unique_ptr<base::Value> HostResolver::GetDnsConfigAsValue() const {
   return nullptr;
 }
 
+void HostResolver::InitializePersistence(
+    const PersistCallback& persist_callback,
+    std::unique_ptr<const base::Value> old_data) {}
+
 // static
 std::unique_ptr<HostResolver> HostResolver::CreateSystemResolver(
     const Options& options,
     NetLog* net_log) {
-  return std::unique_ptr<HostResolver>(new HostResolverImpl(options, net_log));
+  return std::unique_ptr<HostResolver>(
+      CreateSystemResolverImpl(options, net_log).release());
+}
+
+// static
+std::unique_ptr<HostResolverImpl> HostResolver::CreateSystemResolverImpl(
+    const Options& options,
+    NetLog* net_log) {
+  return base::WrapUnique(new HostResolverImpl(options, net_log));
 }
 
 // static
 std::unique_ptr<HostResolver> HostResolver::CreateDefaultResolver(
     NetLog* net_log) {
-  return std::unique_ptr<HostResolver>(
-      new HostResolverImpl(Options(), net_log));
+  return CreateSystemResolver(Options(), net_log);
 }
 
-HostResolver::HostResolver() {
+// static
+std::unique_ptr<HostResolverImpl> HostResolver::CreateDefaultResolverImpl(
+    NetLog* net_log) {
+  return CreateSystemResolverImpl(Options(), net_log);
 }
 
+HostResolver::HostResolver() {}
+
 }  // namespace net