Index: net/dns/host_resolver_mojo.cc |
diff --git a/net/dns/host_resolver_mojo.cc b/net/dns/host_resolver_mojo.cc |
index 42801461c0a6121a7cad04f7de50b36f6e80f1aa..3c1e06581ac494a3cb2d90aa841af351cdee940a 100644 |
--- a/net/dns/host_resolver_mojo.cc |
+++ b/net/dns/host_resolver_mojo.cc |
@@ -9,7 +9,6 @@ |
#include "mojo/public/cpp/bindings/binding.h" |
#include "net/base/address_list.h" |
#include "net/base/net_errors.h" |
-#include "net/dns/mojo_host_type_converters.h" |
#include "net/log/net_log.h" |
namespace net { |
@@ -38,8 +37,7 @@ class HostResolverMojo::Job : public interfaces::HostResolverRequestClient { |
private: |
// interfaces::HostResolverRequestClient override. |
- void ReportResult(int32_t error, |
- interfaces::AddressListPtr address_list) override; |
+ void ReportResult(int32_t error, const AddressList& address_list) override; |
// Mojo error handler. |
void OnConnectionError(); |
@@ -79,7 +77,7 @@ int HostResolverMojo::Resolve(const RequestInfo& info, |
interfaces::HostResolverRequestClientPtr handle; |
*request_handle = new Job(key, addresses, callback, mojo::GetProxy(&handle), |
host_cache_weak_factory_.GetWeakPtr()); |
- impl_->ResolveDns(interfaces::HostResolverRequestInfo::From(info), |
+ impl_->ResolveDns(base::MakeUnique<HostResolver::RequestInfo>(info), |
std::move(handle)); |
return ERR_IO_PENDING; |
} |
@@ -138,11 +136,10 @@ HostResolverMojo::Job::Job( |
&HostResolverMojo::Job::OnConnectionError, base::Unretained(this))); |
} |
-void HostResolverMojo::Job::ReportResult( |
- int32_t error, |
- interfaces::AddressListPtr address_list) { |
- if (error == OK && address_list) |
- *addresses_ = address_list->To<AddressList>(); |
+void HostResolverMojo::Job::ReportResult(int32_t error, |
+ const AddressList& address_list) { |
+ if (error == OK) |
+ *addresses_ = address_list; |
if (host_cache_) { |
base::TimeDelta ttl = base::TimeDelta::FromSeconds( |
error == OK ? kCacheEntryTTLSeconds : kNegativeCacheEntryTTLSeconds); |
@@ -154,7 +151,7 @@ void HostResolverMojo::Job::ReportResult( |
} |
void HostResolverMojo::Job::OnConnectionError() { |
- ReportResult(ERR_FAILED, interfaces::AddressListPtr()); |
+ ReportResult(ERR_FAILED, AddressList()); |
} |
} // namespace net |