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

net/socket/socks_client_socket_unittest.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 "net/socket/socks_client_socket.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 86 matching lines @@
   return std::unique_ptr<SOCKSClientSocket>(new SOCKSClientSocket(
       std::move(connection),
       HostResolver::RequestInfo(HostPortPair(hostname, port)), DEFAULT_PRIORITY,
       host_resolver));
 }
 
 // Implementation of HostResolver that never completes its resolve request.
 // We use this in the test "DisconnectWhileHostResolveInProgress" to make
 // sure that the outstanding resolve request gets cancelled.
 class HangingHostResolverWithCancel : public HostResolver {
+ private:
+  class RequestImpl;

[mmenke, 2016/07/19 19:03:56]

Can't have a private section before the public section, per google style guide..

[maksims (do not use this acc), 2016/07/21 07:12:46]

Done.

+
  public:
   HangingHostResolverWithCancel() : outstanding_request_(NULL) {}
 
   int Resolve(const RequestInfo& info,
               RequestPriority priority,
               AddressList* addresses,
               const CompletionCallback& callback,
-              RequestHandle* out_req,
+              std::unique_ptr<Request>* out_req,
               const BoundNetLog& net_log) override {
     DCHECK(addresses);
     DCHECK_EQ(false, callback.is_null());
     EXPECT_FALSE(HasOutstandingRequest());
-    outstanding_request_ = reinterpret_cast<RequestHandle>(1);
-    *out_req = outstanding_request_;
+    outstanding_request_ = new RequestImpl(this);
+    (*out_req).reset(outstanding_request_);

[mmenke, 2016/07/19 19:03:56]

out_req->reset

[maksims (do not use this acc), 2016/07/21 07:12:46]

Done.

     return ERR_IO_PENDING;
   }
 
   int ResolveFromCache(const RequestInfo& info,
                        AddressList* addresses,
                        const BoundNetLog& net_log) override {
     NOTIMPLEMENTED();
     return ERR_UNEXPECTED;
   }
 
-  void CancelRequest(RequestHandle req) override {
+  void RemoveRequest(RequestImpl* req) {
     EXPECT_TRUE(HasOutstandingRequest());
     EXPECT_EQ(outstanding_request_, req);
-    outstanding_request_ = NULL;
+    outstanding_request_ = nullptr;
   }
 
-  bool HasOutstandingRequest() {
-    return outstanding_request_ != NULL;
-  }
+  bool HasOutstandingRequest() { return outstanding_request_ != nullptr; }
 
  private:
-  RequestHandle outstanding_request_;
+  class RequestImpl : public HostResolver::Request {
+   public:
+    RequestImpl(HangingHostResolverWithCancel* resolver)
+        : resolver_(resolver) {}
+    ~RequestImpl() override {
+      DCHECK(resolver_);
+      resolver_->RemoveRequest(this);
+    }
+
+    void ChangeRequestPriority(RequestPriority priority) override {}
+
+   private:
+    HangingHostResolverWithCancel* resolver_;
+  };
+
+  RequestImpl* outstanding_request_;
 
   DISALLOW_COPY_AND_ASSIGN(HangingHostResolverWithCancel);
 };
 
 // Tests a complete handshake and the disconnection.
 TEST_F(SOCKSClientSocketTest, CompleteHandshake) {
   const std::string payload_write = "random data";
   const std::string payload_read = "moar random data";
 
   MockWrite data_writes[] = {
@@ skipping 299 matching lines @@
                                NULL, 0,
                                host_resolver.get(),
                                kHostName, 80,
                                NULL);
 
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED,
             callback_.GetResult(user_sock_->Connect(callback_.callback())));
 }
 
 }  // namespace net