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

extensions/browser/api/socket/socket_api.cc

 // Copyright 2014 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 "extensions/browser/api/socket/socket_api.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 186 matching lines @@
   return resource_context_ != NULL;
 }
 
 void SocketExtensionWithDnsLookupFunction::StartDnsLookup(
     const net::HostPortPair& host_port_pair) {
   net::HostResolver* host_resolver =
       HostResolverWrapper::GetInstance()->GetHostResolver(resource_context_);
   DCHECK(host_resolver);
 
   // RequestHandle is not needed because we never need to cancel requests.
-  net::HostResolver::RequestHandle request_handle;
+  std::unique_ptr<net::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.

 
   net::HostResolver::RequestInfo request_info(host_port_pair);
   int resolve_result = host_resolver->Resolve(
       request_info, net::DEFAULT_PRIORITY, &addresses_,
       base::Bind(&SocketExtensionWithDnsLookupFunction::OnDnsLookup, this),
-      &request_handle, net::BoundNetLog());
+      &request, net::BoundNetLog());
 
   if (resolve_result != net::ERR_IO_PENDING)
     OnDnsLookup(resolve_result);
+  if (resolve_result == net::ERR_IO_PENDING)
+    request_ = std::move(request);
 }
 
 void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) {
   if (resolve_result == net::OK) {
     DCHECK(!addresses_.empty());
   } else {
     error_ = kDnsLookupFailedError;
   }
   AfterDnsLookup(resolve_result);
 }
@@ skipping 865 matching lines @@
   } else {
     RemoveSocket(params_->socket_id);
     error_ = net::ErrorToString(result);
   }
 
   results_ = api::socket::Secure::Results::Create(result);
   AsyncWorkCompleted();
 }
 
 }  // namespace extensions