Reland "Change ProxyResolver::GetProxyForURL() to take a unique_ptr<Request>* "

net/proxy/multi_threaded_proxy_resolver_unittest.cc

Index: net/proxy/multi_threaded_proxy_resolver_unittest.cc
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index 37a9347b7f8e30d14f9ab5df30b8b7cca14d0090..b63aeb4d4e7434a3b728b86f462fb7e11ec9d1a7 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -53,7 +53,7 @@ class MockProxyResolver : public ProxyResolver {
   int GetProxyForURL(const GURL& query_url,
                      ProxyInfo* results,
                      const CompletionCallback& callback,
-                     RequestHandle* request,
+                     std::unique_ptr<Request>* request,
                      const NetLogWithSource& net_log) override {
     if (!resolve_latency_.is_zero())
       base::PlatformThread::Sleep(resolve_latency_);
@@ -72,13 +72,6 @@ class MockProxyResolver : public ProxyResolver {
     return request_count_++;
   }
 
-  void CancelRequest(RequestHandle request) override { NOTREACHED(); }
-
-  LoadState GetLoadState(RequestHandle request) const override {
-    NOTREACHED();
-    return LOAD_STATE_IDLE;
-  }
-
   int request_count() const { return request_count_; }
 
   void SetResolveLatency(base::TimeDelta latency) {
@@ -128,7 +121,7 @@ class BlockableProxyResolver : public MockProxyResolver {
   int GetProxyForURL(const GURL& query_url,
                      ProxyInfo* results,
                      const CompletionCallback& callback,
-                     RequestHandle* request,
+                     std::unique_ptr<Request>* request,
                      const NetLogWithSource& net_log) override {
     if (should_block_) {
       blocked_.Signal();
@@ -319,7 +312,7 @@ TEST_F(MultiThreadedProxyResolverTest,
   factory().resolvers()[0]->Block();
 
   // Start request 0.
-  ProxyResolver::RequestHandle request0;
+  std::unique_ptr<ProxyResolver::Request> request0;
   TestCompletionCallback callback0;
   ProxyInfo results0;
   BoundTestNetLog log0;
@@ -336,7 +329,7 @@ TEST_F(MultiThreadedProxyResolverTest,
                                  callback1.callback(), NULL, log1.bound());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
 
-  ProxyResolver::RequestHandle request2;
+  std::unique_ptr<ProxyResolver::Request> request2;
   TestCompletionCallback callback2;
   ProxyInfo results2;
   BoundTestNetLog log2;
@@ -399,7 +392,7 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
   factory().resolvers()[0]->Block();
 
   // Start request 0.
-  ProxyResolver::RequestHandle request0;
+  std::unique_ptr<ProxyResolver::Request> request0;
   TestCompletionCallback callback0;
   ProxyInfo results0;
   rv = resolver().GetProxyForURL(GURL("http://request0"), &results0,
@@ -419,7 +412,7 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
                                 callback1.callback(), NULL, NetLogWithSource());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
 
-  ProxyResolver::RequestHandle request2;
+  std::unique_ptr<ProxyResolver::Request> request2;
   TestCompletionCallback callback2;
   ProxyInfo results2;
   rv = resolver().GetProxyForURL(GURL("http://request2"), &results2,
@@ -435,8 +428,8 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
 
   // Cancel request0 (inprogress) and request2 (pending).
-  resolver().CancelRequest(request0);
-  resolver().CancelRequest(request2);
+  request0.reset();
+  request2.reset();
 
   // Unblock the worker thread so the requests can continue running.
   factory().resolvers()[0]->Unblock();
@@ -533,7 +526,7 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
   int rv;
   TestCompletionCallback callback[kNumRequests];
   ProxyInfo results[kNumRequests];
-  ProxyResolver::RequestHandle request[kNumRequests];
+  std::unique_ptr<ProxyResolver::Request> request[kNumRequests];
 
   // Start request 0 -- this should run on thread 0 as there is nothing else
   // going on right now.
@@ -608,8 +601,8 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
                                  callback[7].callback(), &request[7],
                                  NetLogWithSource());
   EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
-  resolver().CancelRequest(request[5]);
-  resolver().CancelRequest(request[6]);
+  request[5].reset();
+  request[6].reset();
 
   EXPECT_EQ(2, callback[7].WaitForResult());
 
@@ -645,7 +638,7 @@ TEST_F(MultiThreadedProxyResolverTest, OneThreadBlocked) {
   const int kNumRequests = 4;
   TestCompletionCallback callback[kNumRequests];
   ProxyInfo results[kNumRequests];
-  ProxyResolver::RequestHandle request[kNumRequests];
+  std::unique_ptr<ProxyResolver::Request> request[kNumRequests];
 
   // Start a request that will block the first thread.