Revert of Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a Reque…

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 1eaed5fde0667cb811c9630f2226eaa84296bd57..5c29864acad37dc634301c198d1cdc6d14f1da70 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -46,7 +46,7 @@ class MockProxyResolver : public ProxyResolver {
   int GetProxyForURL(const GURL& query_url,
                      ProxyInfo* results,
                      const CompletionCallback& callback,
-                     scoped_ptr<Request>* request,
+                     RequestHandle* request,
                      const BoundNetLog& net_log) override {
     if (resolve_latency_ != base::TimeDelta())
       base::PlatformThread::Sleep(resolve_latency_);
@@ -65,6 +65,13 @@ 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) {
@@ -113,7 +120,7 @@ class BlockableProxyResolver : public MockProxyResolver {
   int GetProxyForURL(const GURL& query_url,
                      ProxyInfo* results,
                      const CompletionCallback& callback,
-                     scoped_ptr<Request>* request,
+                     RequestHandle* request,
                      const BoundNetLog& net_log) override {
     if (should_block_) {
       blocked_.Signal();
@@ -301,7 +308,7 @@ TEST_F(MultiThreadedProxyResolverTest,
   factory().resolvers()[0]->Block();
 
   // Start request 0.
-  scoped_ptr<ProxyResolver::Request> request0;
+  ProxyResolver::RequestHandle request0;
   TestCompletionCallback callback0;
   ProxyInfo results0;
   BoundTestNetLog log0;
@@ -318,7 +325,7 @@ TEST_F(MultiThreadedProxyResolverTest,
                                  callback1.callback(), NULL, log1.bound());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
-  scoped_ptr<ProxyResolver::Request> request2;
+  ProxyResolver::RequestHandle request2;
   TestCompletionCallback callback2;
   ProxyInfo results2;
   BoundTestNetLog log2;
@@ -386,7 +393,7 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
   factory().resolvers()[0]->Block();
 
   // Start request 0.
-  scoped_ptr<ProxyResolver::Request> request0;
+  ProxyResolver::RequestHandle request0;
   TestCompletionCallback callback0;
   ProxyInfo results0;
   rv =
@@ -405,7 +412,7 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
                                  callback1.callback(), NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
-  scoped_ptr<ProxyResolver::Request> request2;
+  ProxyResolver::RequestHandle request2;
   TestCompletionCallback callback2;
   ProxyInfo results2;
   rv =
@@ -420,8 +427,8 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Cancel request0 (inprogress) and request2 (pending).
-  request0.reset();
-  request2.reset();
+  resolver().CancelRequest(request0);
+  resolver().CancelRequest(request2);
 
   // Unblock the worker thread so the requests can continue running.
   factory().resolvers()[0]->Unblock();
@@ -515,7 +522,7 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
   int rv;
   TestCompletionCallback callback[kNumRequests];
   ProxyInfo results[kNumRequests];
-  scoped_ptr<ProxyResolver::Request> request[kNumRequests];
+  ProxyResolver::RequestHandle request[kNumRequests];
 
   // Start request 0 -- this should run on thread 0 as there is nothing else
   // going on right now.
@@ -590,8 +597,8 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
                                  callback[7].callback(), &request[7],
                                  BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
-  request[5].reset();
-  request[6].reset();
+  resolver().CancelRequest(request[5]);
+  resolver().CancelRequest(request[6]);
 
   EXPECT_EQ(2, callback[7].WaitForResult());
 
@@ -627,7 +634,7 @@ TEST_F(MultiThreadedProxyResolverTest, OneThreadBlocked) {
   const int kNumRequests = 4;
   TestCompletionCallback callback[kNumRequests];
   ProxyInfo results[kNumRequests];
-  scoped_ptr<ProxyResolver::Request> request[kNumRequests];
+  ProxyResolver::RequestHandle request[kNumRequests];
 
   // Start a request that will block the first thread.