Remove the concept of threading from ProxyService, and move it into the Proxy...

net/proxy/proxy_resolver_winhttp.cc

 // Copyright (c) 2006-2008 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/histogram.h"
@@ skipping 27 matching lines @@
 }
 
 static void FreeInfo(WINHTTP_PROXY_INFO* info) {
   if (info->lpszProxy)
     GlobalFree(info->lpszProxy);
   if (info->lpszProxyBypass)
     GlobalFree(info->lpszProxyBypass);
 }
 
 ProxyResolverWinHttp::ProxyResolverWinHttp()
-    : ProxyResolver(true), session_handle_(NULL) {
+    : ProxyResolver(false /*expects_pac_bytes*/), session_handle_(NULL) {
 }
 
 ProxyResolverWinHttp::~ProxyResolverWinHttp() {
   CloseWinHttpSession();
 }
 
 int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url,
-                                         const GURL& pac_url,
-                                         ProxyInfo* results) {
+                                         ProxyInfo* results,
+                                         CompletionCallback* /*callback*/,
+                                         RequestHandle* /*request*/) {
   // 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.
   //
   WINHTTP_AUTOPROXY_OPTIONS options = {0};
   options.fAutoLogonIfChallenged = FALSE;
   options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL;
-  std::wstring pac_url_wide = ASCIIToWide(pac_url.spec());
+  std::wstring pac_url_wide = ASCIIToWide(pac_url_.spec());
   options.lpszAutoConfigUrl =
       pac_url_wide.empty() ? L"http://wpad/wpad.dat" : pac_url_wide.c_str();
 
   WINHTTP_PROXY_INFO info = {0};
   DCHECK(session_handle_);
 
   // Per http://msdn.microsoft.com/en-us/library/aa383153(VS.85).aspx, it is
   // necessary to first try resolving with fAutoLogonIfChallenged set to false.
   // Otherwise, we fail over to trying it with a value of true.  This way we
   // get good performance in the case where WinHTTP uses an out-of-process
@@ skipping 45 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();
+}
+
+void ProxyResolverWinHttp::SetPacScriptByUrlInternal(const GURL& pac_url) {
+  pac_url_ = pac_url;
+}
+
 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;
 
   // Since this session handle will never be used for WinHTTP connections,
   // these timeouts don't really mean much individually.  However, WinHTTP's
   // out of process PAC resolution will use a combined (sum of all timeouts)
   // value to wait for an RPC reply.
   BOOL rv = WinHttpSetTimeouts(session_handle_, 10000, 10000, 5000, 5000);
   DCHECK(rv);
 
   return true;
 }
 
 void ProxyResolverWinHttp::CloseWinHttpSession() {
   if (session_handle_) {
     WinHttpCloseHandle(session_handle_);
     session_handle_ = NULL;
   }
 }
 
 }  // namespace net