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

net/socket/socks_client_socket_unittest.cc

Index: net/socket/socks_client_socket_unittest.cc
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index e287783955403c26408ae7fc20f8059701455da9..47d8aadaa3799395427d9dc7bd3886c37c4af8f3 100644
--- a/net/socket/socks_client_socket_unittest.cc
+++ b/net/socket/socks_client_socket_unittest.cc
@@ -111,13 +111,14 @@ class HangingHostResolverWithCancel : public HostResolver {
               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_);
+
     return ERR_IO_PENDING;
   }
 
@@ -128,18 +129,37 @@ class HangingHostResolverWithCancel : public HostResolver {
     return ERR_UNEXPECTED;
   }
 
-  void CancelRequest(RequestHandle req) override {
-    EXPECT_TRUE(HasOutstandingRequest());
-    EXPECT_EQ(outstanding_request_, req);
-    outstanding_request_ = NULL;
-  }
-
   bool HasOutstandingRequest() {
     return outstanding_request_ != NULL;
   }
 
  private:
-  RequestHandle outstanding_request_;
+  class RequestImpl : public HostResolver::Request {
+   public:
+    explicit RequestImpl(HangingHostResolverWithCancel* resolver)
+        : resolver_(resolver) {}
+
+    ~RequestImpl() override {
+      if (resolver_) {
+        EXPECT_TRUE(resolver_->HasOutstandingRequest());
+        EXPECT_EQ(resolver_->outstanding_request_, this);
+        resolver_->outstanding_request_ = nullptr;
+      }
+    }
+
+    void ChangeRequestPriority(RequestPriority priority) override {}
+
+    void RemoveResolver() { resolver_ = nullptr; }
+
+   private:
+    HangingHostResolverWithCancel* resolver_;
+
+    DISALLOW_COPY_AND_ASSIGN(RequestImpl);
+  };
+
+  friend RequestImpl;
+
+  RequestImpl* outstanding_request_;
 
   DISALLOW_COPY_AND_ASSIGN(HangingHostResolverWithCancel);
 };