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

net/proxy/proxy_resolver_v8_tracing_wrapper.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/proxy_resolver_v8_tracing_wrapper.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 70 matching lines @@
  public:
   ProxyResolverV8TracingWrapper(
       scoped_ptr<ProxyResolverV8Tracing> resolver_impl,
       NetLog* net_log,
       HostResolver* host_resolver,
       scoped_ptr<ProxyResolverErrorObserver> error_observer);
 
   int GetProxyForURL(const GURL& url,
                      ProxyInfo* results,
                      const CompletionCallback& callback,
-                     scoped_ptr<Request>* request,
+                     RequestHandle* request,
                      const BoundNetLog& net_log) override;
 
+  void CancelRequest(RequestHandle request) override;
+
+  LoadState GetLoadState(RequestHandle request) const override;
+
  private:
   scoped_ptr<ProxyResolverV8Tracing> resolver_impl_;
   NetLog* net_log_;
   HostResolver* host_resolver_;
   scoped_ptr<ProxyResolverErrorObserver> error_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8TracingWrapper);
 };
 
 ProxyResolverV8TracingWrapper::ProxyResolverV8TracingWrapper(
     scoped_ptr<ProxyResolverV8Tracing> resolver_impl,
     NetLog* net_log,
     HostResolver* host_resolver,
     scoped_ptr<ProxyResolverErrorObserver> error_observer)
     : resolver_impl_(std::move(resolver_impl)),
       net_log_(net_log),
       host_resolver_(host_resolver),
       error_observer_(std::move(error_observer)) {}
 
 int ProxyResolverV8TracingWrapper::GetProxyForURL(
     const GURL& url,
     ProxyInfo* results,
     const CompletionCallback& callback,
-    scoped_ptr<Request>* request,
+    RequestHandle* request,
     const BoundNetLog& net_log) {
   resolver_impl_->GetProxyForURL(
       url, results, callback, request,
       make_scoped_ptr(new BindingsImpl(error_observer_.get(), host_resolver_,
                                        net_log_, net_log)));
   return ERR_IO_PENDING;
 }
 
+void ProxyResolverV8TracingWrapper::CancelRequest(RequestHandle request) {
+  resolver_impl_->CancelRequest(request);
+}
+
+LoadState ProxyResolverV8TracingWrapper::GetLoadState(
+    RequestHandle request) const {
+  return resolver_impl_->GetLoadState(request);
+}
+
 }  // namespace
 
 ProxyResolverFactoryV8TracingWrapper::ProxyResolverFactoryV8TracingWrapper(
     HostResolver* host_resolver,
     NetLog* net_log,
     const base::Callback<scoped_ptr<ProxyResolverErrorObserver>()>&
         error_observer_factory)
     : ProxyResolverFactory(true),
       factory_impl_(ProxyResolverV8TracingFactory::Create()),
       host_resolver_(host_resolver),
@@ skipping 37 matching lines @@
     int error) {
   if (error == OK) {
     resolver->reset(new ProxyResolverV8TracingWrapper(
         std::move(*v8_resolver), net_log_, host_resolver_,
         std::move(error_observer)));
   }
   callback.Run(error);
 }
 
 }  // namespace net