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

net/proxy/proxy_resolver_factory_mojo_unittest.cc

Index: net/proxy/proxy_resolver_factory_mojo_unittest.cc
diff --git a/net/proxy/proxy_resolver_factory_mojo_unittest.cc b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
index 0830609004172e481d7f9f7cedff8fc5c07c2497..9fa4ef587ec2d3dad784454ad2538e90f8127136 100644
--- a/net/proxy/proxy_resolver_factory_mojo_unittest.cc
+++ b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
@@ -294,14 +294,14 @@
   int WaitForResult();
 
   const ProxyInfo& results() const { return results_; }
-  LoadState load_state() { return request_->GetLoadState(); }
+  LoadState load_state() { return resolver_->GetLoadState(handle_); }
   BoundTestNetLog& net_log() { return net_log_; }
 
  private:
   ProxyResolver* resolver_;
   const GURL url_;
   ProxyInfo results_;
-  scoped_ptr<ProxyResolver::Request> request_;
+  ProxyResolver::RequestHandle handle_;
   int error_;
   TestCompletionCallback callback_;
   BoundTestNetLog net_log_;
@@ -313,12 +313,12 @@
 
 int Request::Resolve() {
   error_ = resolver_->GetProxyForURL(url_, &results_, callback_.callback(),
-                                     &request_, net_log_.bound());
+                                     &handle_, net_log_.bound());
   return error_;
 }
 
 void Request::Cancel() {
-  request_.reset();
+  resolver_->CancelRequest(handle_);
 }
 
 int Request::WaitForResult() {
@@ -841,7 +841,7 @@
 
   ProxyInfo results;
   TestCompletionCallback callback;
-  scoped_ptr<ProxyResolver::Request> request;
+  ProxyResolver::RequestHandle handle;
   BoundNetLog net_log;
   EXPECT_EQ(
       OK,
@@ -849,7 +849,7 @@
           GURL(kExampleUrl), &results,
           base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback,
                      base::Unretained(this), callback.callback()),
-          &request, net_log)));
+          &handle, net_log)));
   on_delete_callback_.WaitForResult();
 }
 
@@ -861,7 +861,7 @@
 
   ProxyInfo results;
   TestCompletionCallback callback;
-  scoped_ptr<ProxyResolver::Request> request;
+  ProxyResolver::RequestHandle handle;
   BoundNetLog net_log;
   EXPECT_EQ(
       ERR_PAC_SCRIPT_TERMINATED,
@@ -869,7 +869,7 @@
           GURL(kExampleUrl), &results,
           base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback,
                      base::Unretained(this), callback.callback()),
-          &request, net_log)));
+          &handle, net_log)));
   on_delete_callback_.WaitForResult();
 }