Change HostResolver::Resolve() to take an std::unique_ptr<Request>* rather than a RequestHandle*

net/dns/mojo_host_resolver_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/dns/mojo_host_resolver_impl.h"
 
 #include <utility>
 
 #include "base/stl_util.h"
 #include "net/base/address_list.h"
@@ skipping 23 matching lines @@
   void OnResolveDone(int result);
 
   // Mojo error handler.
   void OnConnectionError();
 
   MojoHostResolverImpl* resolver_service_;
   net::HostResolver* resolver_;
   net::HostResolver::RequestInfo request_info_;
   const BoundNetLog net_log_;
   interfaces::HostResolverRequestClientPtr client_;
-  net::HostResolver::RequestHandle handle_;
+  std::unique_ptr<net::HostResolver::Request> request_;
   AddressList result_;
   base::ThreadChecker thread_checker_;
 };
 
 MojoHostResolverImpl::MojoHostResolverImpl(net::HostResolver* resolver,
                                            const BoundNetLog& net_log)
     : resolver_(resolver), net_log_(net_log) {
 }
 
 MojoHostResolverImpl::~MojoHostResolverImpl() {
@@ skipping 29 matching lines @@
 MojoHostResolverImpl::Job::Job(
     MojoHostResolverImpl* resolver_service,
     net::HostResolver* resolver,
     const net::HostResolver::RequestInfo& request_info,
     const BoundNetLog& net_log,
     interfaces::HostResolverRequestClientPtr client)
     : resolver_service_(resolver_service),
       resolver_(resolver),
       request_info_(request_info),
       net_log_(net_log),
-      client_(std::move(client)),
-      handle_(nullptr) {
+      client_(std::move(client)) {
   client_.set_connection_error_handler(base::Bind(
       &MojoHostResolverImpl::Job::OnConnectionError, base::Unretained(this)));
 }
 
 void MojoHostResolverImpl::Job::Start() {
   DVLOG(1) << "Resolve " << request_info_.host_port_pair().ToString();
   int result =
       resolver_->Resolve(request_info_, DEFAULT_PRIORITY, &result_,
                          base::Bind(&MojoHostResolverImpl::Job::OnResolveDone,
                                     base::Unretained(this)),
-                         &handle_, net_log_);
+                         &request_, net_log_);
 
   if (result != ERR_IO_PENDING)
     OnResolveDone(result);
 }
 
 MojoHostResolverImpl::Job::~Job() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (handle_)
-    resolver_->CancelRequest(handle_);
 }
 
 void MojoHostResolverImpl::Job::OnResolveDone(int result) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  handle_ = nullptr;
+  request_.reset();
   DVLOG(1) << "Resolved " << request_info_.host_port_pair().ToString()
            << " with error " << result << " and " << result_.size()
            << " results!";
   for (const auto& address : result_) {
     DVLOG(1) << address.ToString();
   }
   if (result == OK)
     client_->ReportResult(result, interfaces::AddressList::From(result_));
   else
     client_->ReportResult(result, nullptr);
 
   resolver_service_->DeleteJob(this);
 }
 
 void MojoHostResolverImpl::Job::OnConnectionError() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // |resolver_service_| should always outlive us.
   DCHECK(resolver_service_);
   DVLOG(1) << "Connection error on request for "
            << request_info_.host_port_pair().ToString();
   resolver_service_->DeleteJob(this);
 }
 
 }  // namespace net