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 185 matching lines @@
   resource_context_ = browser_context()->GetResourceContext();
   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;
-
   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_handle_, net::BoundNetLog());
 
   if (resolve_result != net::ERR_IO_PENDING)
     OnDnsLookup(resolve_result);
 }
 
 void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) {
   if (resolve_result == net::OK) {
     DCHECK(!addresses_.empty());
   } else {
     error_ = kDnsLookupFailedError;
@@ skipping 102 matching lines @@
   StartDnsLookup(net::HostPortPair(hostname_, port_));
 }
 
 void SocketConnectFunction::AfterDnsLookup(int lookup_result) {
   if (lookup_result == net::OK) {
     StartConnect();
   } else {
     SetResult(base::MakeUnique<base::FundamentalValue>(lookup_result));
     AsyncWorkCompleted();
   }
+  // TODO(maksims): investigate why std::unique_ptr<HostResolver::Request>'s
+  // destructor is not called automatically.
+  request_handle_.reset();

[Devlin, 2016/07/12 15:04:51]

ditto

[maksims (do not use this acc), 2016/07/19 15:00:25]

Done.

 }
 
 void SocketConnectFunction::StartConnect() {
   Socket* socket = GetSocket(socket_id_);
   if (!socket) {
     error_ = kSocketNotFoundError;
     SetResult(base::MakeUnique<base::FundamentalValue>(-1));
     AsyncWorkCompleted();
     return;
   }
@@ skipping 312 matching lines @@
   StartDnsLookup(net::HostPortPair(hostname_, port_));
 }
 
 void SocketSendToFunction::AfterDnsLookup(int lookup_result) {
   if (lookup_result == net::OK) {
     StartSendTo();
   } else {
     SetResult(base::MakeUnique<base::FundamentalValue>(lookup_result));
     AsyncWorkCompleted();
   }
+
+  // TODO(maksims): investigate why std::unique_ptr<HostResolver::Request>'s
+  // destructor is not called automatically.
+  request_handle_.reset();
 }
 
 void SocketSendToFunction::StartSendTo() {
   Socket* socket = GetSocket(socket_id_);
   if (!socket) {
     error_ = kSocketNotFoundError;
     SetResult(base::MakeUnique<base::FundamentalValue>(-1));
     AsyncWorkCompleted();
     return;
   }
@@ skipping 414 matching lines @@
   } else {
     RemoveSocket(params_->socket_id);
     error_ = net::ErrorToString(result);
   }
 
   results_ = api::socket::Secure::Results::Create(result);
   AsyncWorkCompleted();
 }
 
 }  // namespace extensions