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

net/dns/host_resolver_impl_fuzzer.cc

 // Copyright 2016 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
@@ skipping 20 matching lines @@
 };
 
 class DnsRequest {
  public:
   DnsRequest(net::HostResolver* host_resolver,
              net::FuzzedDataProvider* data_provider,
              std::vector<std::unique_ptr<DnsRequest>>* dns_requests)
       : host_resolver_(host_resolver),
         data_provider_(data_provider),
         dns_requests_(dns_requests),
-        handle_(nullptr),
         is_running_(false) {}
 
-  ~DnsRequest() {
-    if (is_running_)
-      Cancel();
-  }
+  ~DnsRequest() {}
 
   // Creates and starts a DNS request using fuzzed parameters. If the request
   // doesn't complete synchronously, adds it to |dns_requests|.
   static void CreateRequest(
       net::HostResolver* host_resolver,
       net::FuzzedDataProvider* data_provider,
       std::vector<std::unique_ptr<DnsRequest>>* dns_requests) {
     std::unique_ptr<DnsRequest> dns_request(
         new DnsRequest(host_resolver, data_provider, dns_requests));
 
@@ skipping 32 matching lines @@
     auto request = dns_requests->begin() + index;
     (*request)->Cancel();
     dns_requests->erase(request);
   }
 
  private:
   void OnCallback(int result) {
     CHECK_NE(net::ERR_IO_PENDING, result);
 
     is_running_ = false;
+    request_.reset();
 
     // Remove |this| from |dns_requests| and take ownership of it, if it wasn't
     // already removed from the vector. It may have been removed if this is in a
     // WaitForRequest call, in which case, do nothing.
     std::unique_ptr<DnsRequest> self;
     for (auto request = dns_requests_->begin(); request != dns_requests_->end();
          ++request) {
       if (request->get() != this)
         continue;
       self = std::move(*request);
@@ skipping 38 matching lines @@
 
     // Decide if should be a cache-only resolution.
     if (data_provider_->ConsumeBool()) {
       return host_resolver_->ResolveFromCache(info, &address_list_,
                                               net::BoundNetLog());
     }
 
     info.set_allow_cached_response(data_provider_->ConsumeBool());
     return host_resolver_->Resolve(
         info, priority, &address_list_,
-        base::Bind(&DnsRequest::OnCallback, base::Unretained(this)), &handle_,
+        base::Bind(&DnsRequest::OnCallback, base::Unretained(this)), &request_,
         net::BoundNetLog());
   }
 
   // Waits until the request is done, if it isn't done already.
   void WaitUntilDone() {
     CHECK(!run_loop_);
     if (is_running_) {
       run_loop_.reset(new base::RunLoop());
       run_loop_->Run();
       run_loop_.reset();
-      CHECK(!is_running_);
+      DCHECK(request_);
     }
   }
 
   // Cancel the request, if not already completed. Otherwise, does nothing.
   void Cancel() {
-    if (is_running_)
-      host_resolver_->CancelRequest(handle_);
+    request_.reset();
     is_running_ = false;
   }
 
   net::HostResolver* host_resolver_;
   net::FuzzedDataProvider* data_provider_;
   std::vector<std::unique_ptr<DnsRequest>>* dns_requests_;
 
-  net::HostResolver::RequestHandle handle_;
+  std::unique_ptr<net::HostResolver::Request> request_;
   net::AddressList address_list_;
 
   bool is_running_;
 
   std::unique_ptr<base::RunLoop> run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsRequest);
 };
 
 }  // namespace
@@ skipping 35 matching lines @@
           break;
       }
     }
   }
 
   // Clean up any pending tasks, after deleting everything.
   base::RunLoop().RunUntilIdle();
 
   return 0;
 }