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

net/tools/gdig/gdig.cc

 // Copyright (c) 2012 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 <stdio.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 213 matching lines @@
   unsigned replay_log_index_;
   base::Time start_time_;
   int active_resolves_;
   Result result_;
 
   base::CancelableClosure timeout_closure_;
   std::unique_ptr<DnsConfigService> dns_config_service_;
   std::unique_ptr<FileNetLogObserver> log_observer_;
   std::unique_ptr<NetLog> log_;
   std::unique_ptr<HostResolver> resolver_;
+  std::unique_ptr<HostResolver::Request> request_;
 
 #if defined(OS_MACOSX)
   // Without this there will be a mem leak on osx.
   base::mac::ScopedNSAutoreleasePool scoped_pool_;
 #endif
 
   // Need AtExitManager to support AsWeakPtr (in NetLog).
   base::AtExitManager exit_manager_;
 };
 
@@ skipping 214 matching lines @@
     }
 
     HostResolver::RequestInfo info(HostPortPair(entry.domain_name.c_str(), 80));
     AddressList* addrlist = new AddressList();
     unsigned current_index = replay_log_index_;
     CompletionCallback callback = base::Bind(&GDig::OnResolveComplete,
                                              base::Unretained(this),
                                              current_index,
                                              base::Owned(addrlist),
                                              time_since_start);
+    std::unique_ptr<HostResolver::Request> request;

[mmenke, 2016/07/21 16:00:40]

Not needed.

[maksims (do not use this acc), 2016/07/22 10:16:00]

Done.

     ++active_resolves_;
     ++replay_log_index_;
     int ret = resolver_->Resolve(
-        info,
-        DEFAULT_PRIORITY,
-        addrlist,
-        callback,
-        NULL,
+        info, DEFAULT_PRIORITY, addrlist, callback, &request,
         BoundNetLog::Make(log_.get(), net::NetLog::SOURCE_NONE));
     if (ret != ERR_IO_PENDING)
       callback.Run(ret);
+    else if (ret == ERR_IO_PENDING)
+      request_ = std::move(request);
   }
 }
 
 void GDig::OnResolveComplete(unsigned entry_index,
                              AddressList* address_list,
                              base::TimeDelta resolve_start_time,
                              int val) {
   DCHECK_GT(active_resolves_, 0);
   DCHECK(address_list);
   DCHECK_LT(entry_index, replay_log_.size());
@@ skipping 26 matching lines @@
 }
 
 }  // empty namespace
 
 }  // namespace net
 
 int main(int argc, const char* argv[]) {
   net::GDig dig;
   return dig.Main(argc, argv);
 }