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

net/proxy/proxy_resolver_winhttp.cc

Index: net/proxy/proxy_resolver_winhttp.cc
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc
index 6f184c7561d687f8da035c6db5da9f65b3950c0b..8b6692eba0d7ab77b24788ae08641b764f3367bc 100644
--- a/net/proxy/proxy_resolver_winhttp.cc
+++ b/net/proxy/proxy_resolver_winhttp.cc
@@ -60,11 +60,8 @@ class ProxyResolverWinHttp : public ProxyResolver {
   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();
@@ -93,7 +90,7 @@ ProxyResolverWinHttp::~ProxyResolverWinHttp() {
 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())
@@ -173,16 +170,6 @@ int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url,
   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,