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

net/proxy/proxy_resolver_v8_tracing.cc

Index: net/proxy/proxy_resolver_v8_tracing.cc
diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc
index 94ad9f0d6c4df9fcd4a6b1c401f51968b6eb7fc2..0aa8d0c2e92c1aaf63093079b92834f53ed26667 100644
--- a/net/proxy/proxy_resolver_v8_tracing.cc
+++ b/net/proxy/proxy_resolver_v8_tracing.cc
@@ -311,10 +311,18 @@ class ProxyResolverV8TracingImpl : public ProxyResolverV8Tracing,
   void GetProxyForURL(const GURL& url,
                       ProxyInfo* results,
                       const CompletionCallback& callback,
-                      ProxyResolver::RequestHandle* request,
+                      scoped_ptr<ProxyResolver::Request>* request,
                       scoped_ptr<Bindings> bindings) override;
-  void CancelRequest(ProxyResolver::RequestHandle request) override;
-  LoadState GetLoadState(ProxyResolver::RequestHandle request) const override;
+
+  class RequestImpl : public ProxyResolverV8Tracing::Request {
+   public:
+    RequestImpl(scoped_refptr<Job> job);

[eroman, 2016/02/24 03:08:07]

explicit

+    ~RequestImpl() override;
+    LoadState GetLoadState() override;
+
+   private:
+    scoped_refptr<Job> job_;
+  };
 
  private:
   // The worker thread on which the ProxyResolverV8 will be run.
@@ -434,6 +442,8 @@ void Job::SetCallback(const CompletionCallback& callback) {
 }
 
 void Job::ReleaseCallback() {
+  if (callback_.is_null())

[eroman, 2016/02/24 03:08:07]

I don't think this change should go here.

(I presume this was added because Job::Cancel() might be called on a request
that has already completed, in which case it should not be completed a second
time.)

Instead I think we should do the check in Job::Cancel(), since cancellation is
already fairly complicated.

In Job::Cancel() at the top we can do:

  // If the job already completed, there is nothing to be cancelled.
  if (callback_.is_null())
    return;

And then remove this change to ReleaseCallback()

+    return;
   CheckIsOnOriginThread();
   DCHECK(!callback_.is_null());
   CHECK_GT(*params_->num_outstanding_callbacks, 0);
@@ -934,34 +944,33 @@ ProxyResolverV8TracingImpl::~ProxyResolverV8TracingImpl() {
   thread_.reset();
 }
 
+ProxyResolverV8TracingImpl::RequestImpl::RequestImpl(scoped_refptr<Job> job)
+    : job_(job) {}

[eroman, 2016/02/24 03:08:07]

std::move()

+
+ProxyResolverV8TracingImpl::RequestImpl::~RequestImpl() {
+  job_->Cancel();
+}
+
+LoadState ProxyResolverV8TracingImpl::RequestImpl::GetLoadState() {
+  return job_->GetLoadState();
+}
+
 void ProxyResolverV8TracingImpl::GetProxyForURL(
     const GURL& url,
     ProxyInfo* results,
     const CompletionCallback& callback,
-    ProxyResolver::RequestHandle* request,
+    scoped_ptr<ProxyResolver::Request>* request,
     scoped_ptr<Bindings> bindings) {
   DCHECK(CalledOnValidThread());
   DCHECK(!callback.is_null());
 
   scoped_refptr<Job> job = new Job(job_params_.get(), std::move(bindings));
 
-  if (request)

[eroman, 2016/02/24 03:08:06]

Was this intentionally removed? If nothing depends on it and you did mean to
remove it, then please update the documentation for ProxyResolverV8Tracing which
I believe says this can be nullptr.

[eroman, 2016/02/24 19:20:29]

This comment was not addressed.

-    *request = job.get();
+  request->reset(new RequestImpl(job));
 
   job->StartGetProxyForURL(url, results, callback);
 }
 
-void ProxyResolverV8TracingImpl::CancelRequest(
-    ProxyResolver::RequestHandle request) {
-  Job* job = reinterpret_cast<Job*>(request);
-  job->Cancel();
-}
-
-LoadState ProxyResolverV8TracingImpl::GetLoadState(
-    ProxyResolver::RequestHandle request) const {
-  Job* job = reinterpret_cast<Job*>(request);
-  return job->GetLoadState();
-}
 
 class ProxyResolverV8TracingFactoryImpl : public ProxyResolverV8TracingFactory {
  public: