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

Unified Diff: net/dns/mojo_host_resolver_impl.cc

Issue 2083463002: Replace //net TypeConverters with StructTraits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@type-converter-cleanup--gurl
Patch Set: rebase Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: net/dns/mojo_host_resolver_impl.cc
diff --git a/net/dns/mojo_host_resolver_impl.cc b/net/dns/mojo_host_resolver_impl.cc
index 1e32639ec382711b6979f46ae618352a8b6b3732..f8f08d8b249da078cd7fc61fe3f73d665e67f24f 100644
--- a/net/dns/mojo_host_resolver_impl.cc
+++ b/net/dns/mojo_host_resolver_impl.cc
@@ -11,7 +11,6 @@
#include "net/base/net_errors.h"
#include "net/base/network_interfaces.h"
#include "net/dns/host_resolver.h"
-#include "net/dns/mojo_host_type_converters.h"
namespace net {
@@ -56,19 +55,17 @@ MojoHostResolverImpl::~MojoHostResolverImpl() {
}
void MojoHostResolverImpl::Resolve(
- interfaces::HostResolverRequestInfoPtr request_info,
+ std::unique_ptr<HostResolver::RequestInfo> request_info,
interfaces::HostResolverRequestClientPtr client) {
DCHECK(thread_checker_.CalledOnValidThread());
- HostResolver::RequestInfo host_request_info =
- request_info->To<net::HostResolver::RequestInfo>();
- if (host_request_info.is_my_ip_address()) {
+ if (request_info->is_my_ip_address()) {
// The proxy resolver running inside a sandbox may not be able to get the
// correct host name. Instead, fill it ourself if the request is for our own
// IP address.
- host_request_info.set_host_port_pair(HostPortPair(GetHostName(), 80));
+ request_info->set_host_port_pair(HostPortPair(GetHostName(), 80));
}
- Job* job = new Job(this, resolver_, host_request_info, net_log_,
- std::move(client));
+ Job* job =
+ new Job(this, resolver_, *request_info, net_log_, std::move(client));
pending_jobs_.insert(job);
job->Start();
}
@@ -119,11 +116,7 @@ void MojoHostResolverImpl::Job::OnResolveDone(int result) {
for (const auto& address : result_) {
DVLOG(1) << address.ToString();
}
- if (result == OK)
- client_->ReportResult(result, interfaces::AddressList::From(result_));
- else
- client_->ReportResult(result, nullptr);
-
+ client_->ReportResult(result, result_);
resolver_service_->DeleteJob(this);
}

Powered by Google App Engine
This is Rietveld 408576698