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

net/proxy/proxy_resolver_v8_tracing.h

 // Copyright (c) 2013 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.
 
 #ifndef NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_
 #define NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 32 matching lines @@
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Bindings);
   };
 
   virtual ~ProxyResolverV8Tracing() {}
 
   // Gets a list of proxy servers to use for |url|. This request always
   // runs asynchronously and notifies the result by running |callback|. If the
   // result code is OK then the request was successful and |results| contains
-  // the proxy resolution information.  Request can be cancelled by resetting
-  // |*request|.
+  // the proxy resolution information. If |request| is non-null, |*request| is
+  // written to, and can be passed to CancelRequest().
   virtual void GetProxyForURL(const GURL& url,
                               ProxyInfo* results,
                               const CompletionCallback& callback,
-                              scoped_ptr<ProxyResolver::Request>* request,
+                              ProxyResolver::RequestHandle* request,
                               scoped_ptr<Bindings> bindings) = 0;
+
+  // Cancels |request|.
+  virtual void CancelRequest(ProxyResolver::RequestHandle request) = 0;
+
+  // Gets the LoadState for |request|.
+  virtual LoadState GetLoadState(
+      ProxyResolver::RequestHandle request) const = 0;
 };
 
 // A factory for ProxyResolverV8Tracing instances. The default implementation,
 // returned by Create(), creates ProxyResolverV8Tracing instances that execute
 // ProxyResolverV8 on a single helper thread, and do some magic to avoid
 // blocking in DNS. For more details see the design document:
 // https://docs.google.com/a/google.com/document/d/16Ij5OcVnR3s0MH4Z5XkhI9VTPoMJdaBn9rKreAmGOdE/edit?pli=1
 class NET_EXPORT ProxyResolverV8TracingFactory {
  public:
   ProxyResolverV8TracingFactory() {}
   virtual ~ProxyResolverV8TracingFactory() = default;
 
   virtual void CreateProxyResolverV8Tracing(
       const scoped_refptr<ProxyResolverScriptData>& pac_script,
       scoped_ptr<ProxyResolverV8Tracing::Bindings> bindings,
       scoped_ptr<ProxyResolverV8Tracing>* resolver,
       const CompletionCallback& callback,
       scoped_ptr<ProxyResolverFactory::Request>* request) = 0;
 
   static scoped_ptr<ProxyResolverV8TracingFactory> Create();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8TracingFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_