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

net/proxy/proxy_resolver_winhttp.cc

 // Copyright (c) 2011 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_winhttp.h"
 
 #include <windows.h>
 #include <winhttp.h>
 
 #include "base/macros.h"
@@ skipping 42 matching lines @@
 class ProxyResolverWinHttp : public ProxyResolver {
  public:
   ProxyResolverWinHttp(
       const scoped_refptr<ProxyResolverScriptData>& script_data);
   ~ProxyResolverWinHttp() override;
 
   // ProxyResolver implementation:
   int GetProxyForURL(const GURL& url,
                      ProxyInfo* results,
                      const CompletionCallback& /*callback*/,
-                     RequestHandle* /*request*/,
+                     std::unique_ptr<Request>* /*request*/,
                      const NetLogWithSource& /*net_log*/) override;
-  void CancelRequest(RequestHandle request) override;
-
-  LoadState GetLoadState(RequestHandle request) const override;
 
  private:
   bool OpenWinHttpSession();
   void CloseWinHttpSession();
 
   // Proxy configuration is cached on the session handle.
   HINTERNET session_handle_;
 
   const GURL pac_url_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyResolverWinHttp);
 };
 
 ProxyResolverWinHttp::ProxyResolverWinHttp(
     const scoped_refptr<ProxyResolverScriptData>& script_data)
     : session_handle_(NULL),
       pac_url_(script_data->type() == ProxyResolverScriptData::TYPE_AUTO_DETECT
                    ? GURL("http://wpad/wpad.dat")
                    : script_data->url()) {
 }
 
 ProxyResolverWinHttp::~ProxyResolverWinHttp() {
   CloseWinHttpSession();
 }
 
 int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url,
                                          ProxyInfo* results,
                                          const CompletionCallback& /*callback*/,
-                                         RequestHandle* /*request*/,
+                                         std::unique_ptr<Request>* /*request*/,
                                          const NetLogWithSource& /*net_log*/) {
   // If we don't have a WinHTTP session, then create a new one.
   if (!session_handle_ && !OpenWinHttpSession())
     return ERR_FAILED;
 
   // If we have been given an empty PAC url, then use auto-detection.
   //
   // NOTE: We just use DNS-based auto-detection here like Firefox.  We do this
   // to avoid WinHTTP's auto-detection code, which while more featureful (it
   // supports DHCP based auto-detection) also appears to have issues.
@@ skipping 59 matching lines @@
       break;
     default:
       NOTREACHED();
       rv = ERR_FAILED;
   }
 
   FreeInfo(&info);
   return rv;
 }
 
-void ProxyResolverWinHttp::CancelRequest(RequestHandle request) {
-  // This is a synchronous ProxyResolver; no possibility for async requests.
-  NOTREACHED();
-}
-
-LoadState ProxyResolverWinHttp::GetLoadState(RequestHandle request) const {
-  NOTREACHED();
-  return LOAD_STATE_IDLE;
-}
-
 bool ProxyResolverWinHttp::OpenWinHttpSession() {
   DCHECK(!session_handle_);
   session_handle_ = WinHttpOpen(NULL,
                                 WINHTTP_ACCESS_TYPE_NO_PROXY,
                                 WINHTTP_NO_PROXY_NAME,
                                 WINHTTP_NO_PROXY_BYPASS,
                                 0);
   if (!session_handle_)
     return false;
 
@@ skipping 23 matching lines @@
 int ProxyResolverFactoryWinHttp::CreateProxyResolver(
     const scoped_refptr<ProxyResolverScriptData>& pac_script,
     std::unique_ptr<ProxyResolver>* resolver,
     const CompletionCallback& callback,
     std::unique_ptr<Request>* request) {
   resolver->reset(new ProxyResolverWinHttp(pac_script));
   return OK;
 }
 
 }  // namespace net