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

net/proxy/mojo_proxy_resolver_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/mojo_proxy_resolver_impl.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/stl_util.h"
@@ skipping 22 matching lines @@
   // disconnecting, indicating cancellation.
   void OnConnectionError();
 
   void GetProxyDone(int error);
 
   MojoProxyResolverImpl* resolver_;
 
   interfaces::ProxyResolverRequestClientPtr client_;
   ProxyInfo result_;
   GURL url_;
-  scoped_ptr<net::ProxyResolver::Request> request_;
+  net::ProxyResolver::RequestHandle request_handle_;
   bool done_;
 
   DISALLOW_COPY_AND_ASSIGN(Job);
 };
 
 MojoProxyResolverImpl::MojoProxyResolverImpl(
     scoped_ptr<ProxyResolverV8Tracing> resolver)
     : resolver_(std::move(resolver)) {}
 
 MojoProxyResolverImpl::~MojoProxyResolverImpl() {
@@ skipping 16 matching lines @@
   delete job;
 }
 
 MojoProxyResolverImpl::Job::Job(
     interfaces::ProxyResolverRequestClientPtr client,
     MojoProxyResolverImpl* resolver,
     const GURL& url)
     : resolver_(resolver),
       client_(std::move(client)),
       url_(url),
+      request_handle_(nullptr),
       done_(false) {}
 
-MojoProxyResolverImpl::Job::~Job() {}
+MojoProxyResolverImpl::Job::~Job() {
+  if (request_handle_ && !done_)
+    resolver_->resolver_->CancelRequest(request_handle_);
+}
 
 void MojoProxyResolverImpl::Job::Start() {
   resolver_->resolver_->GetProxyForURL(
       url_, &result_, base::Bind(&Job::GetProxyDone, base::Unretained(this)),
-      &request_,
+      &request_handle_,
       make_scoped_ptr(new MojoProxyResolverV8TracingBindings<
                       interfaces::ProxyResolverRequestClient>(client_.get())));
   client_.set_connection_error_handler(base::Bind(
       &MojoProxyResolverImpl::Job::OnConnectionError, base::Unretained(this)));
 }
 
 void MojoProxyResolverImpl::Job::GetProxyDone(int error) {
   done_ = true;
   DVLOG(1) << "GetProxyForUrl(" << url_ << ") finished with error " << error
            << ". " << result_.proxy_list().size() << " Proxies returned:";
   for (const auto& proxy : result_.proxy_list().GetAll()) {
     DVLOG(1) << proxy.ToURI();
   }
   mojo::Array<interfaces::ProxyServerPtr> result;
   if (error == OK) {
     result = mojo::Array<interfaces::ProxyServerPtr>::From(
         result_.proxy_list().GetAll());
   }
   client_->ReportResult(error, std::move(result));
   resolver_->DeleteJob(this);
 }
 
 void MojoProxyResolverImpl::Job::OnConnectionError() {
   resolver_->DeleteJob(this);
 }
 
 }  // namespace net