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

net/proxy/mojo_proxy_resolver_impl.cc

Index: net/proxy/mojo_proxy_resolver_impl.cc
diff --git a/net/proxy/mojo_proxy_resolver_impl.cc b/net/proxy/mojo_proxy_resolver_impl.cc
index f8362421ec71f3785d1da575b4a9983c306512f3..a35f5a7c02a4663139f6c0f5bb7eabdf8f632a12 100644
--- a/net/proxy/mojo_proxy_resolver_impl.cc
+++ b/net/proxy/mojo_proxy_resolver_impl.cc
@@ -37,7 +37,7 @@ class MojoProxyResolverImpl::Job {
   interfaces::ProxyResolverRequestClientPtr client_;
   ProxyInfo result_;
   GURL url_;
-  net::ProxyResolver::RequestHandle request_handle_;
+  std::unique_ptr<net::ProxyResolver::Request> request_;
   bool done_;
 
   DISALLOW_COPY_AND_ASSIGN(Job);
@@ -74,20 +74,15 @@ MojoProxyResolverImpl::Job::Job(
     : resolver_(resolver),
       client_(std::move(client)),
       url_(url),
-      request_handle_(nullptr),
       done_(false) {}
 
-MojoProxyResolverImpl::Job::~Job() {
-  if (request_handle_ && !done_)
-    resolver_->resolver_->CancelRequest(request_handle_);
-}
+MojoProxyResolverImpl::Job::~Job() {}
 
 void MojoProxyResolverImpl::Job::Start() {
   resolver_->resolver_->GetProxyForURL(
       url_, &result_, base::Bind(&Job::GetProxyDone, base::Unretained(this)),
-      &request_handle_,
-      base::MakeUnique<MojoProxyResolverV8TracingBindings<
-          interfaces::ProxyResolverRequestClient>>(client_.get()));
+      &request_, base::MakeUnique<MojoProxyResolverV8TracingBindings<
+                     interfaces::ProxyResolverRequestClient>>(client_.get()));
   client_.set_connection_error_handler(base::Bind(
       &MojoProxyResolverImpl::Job::OnConnectionError, base::Unretained(this)));
 }