Split ProxyResolver into two interfaces:...

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"
-#include "base/string_tokenizer.h"
 #include "net/base/net_errors.h"
 
 #pragma comment(lib, "winhttp.lib")
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace net {
 
 // A small wrapper for histogramming purposes ;-)
 static BOOL CallWinHttpGetProxyForUrl(HINTERNET session, LPCWSTR url,
                                       WINHTTP_AUTOPROXY_OPTIONS* options,
                                       WINHTTP_PROXY_INFO* results) {
   TimeTicks time_start = TimeTicks::Now();
   BOOL rv = WinHttpGetProxyForUrl(session, url, options, results);
   TimeDelta time_delta = TimeTicks::Now() - time_start;
   // Record separately success and failure times since they will have very
   // different characteristics.
   if (rv) {
     UMA_HISTOGRAM_LONG_TIMES(L"Net.GetProxyForUrl_OK", time_delta);
   } else {
     UMA_HISTOGRAM_LONG_TIMES(L"Net.GetProxyForUrl_FAIL", time_delta);
   }
   return rv;
 }
 
-static void FreeConfig(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config) {
-  if (config->lpszAutoConfigUrl)
-    GlobalFree(config->lpszAutoConfigUrl);
-  if (config->lpszProxy)
-    GlobalFree(config->lpszProxy);
-  if (config->lpszProxyBypass)
-    GlobalFree(config->lpszProxyBypass);
-}
-
 static void FreeInfo(WINHTTP_PROXY_INFO* info) {
   if (info->lpszProxy)
     GlobalFree(info->lpszProxy);
   if (info->lpszProxyBypass)
     GlobalFree(info->lpszProxyBypass);
 }
 
 ProxyResolverWinHttp::ProxyResolverWinHttp()
     : session_handle_(NULL) {
 }
 
 ProxyResolverWinHttp::~ProxyResolverWinHttp() {
   CloseWinHttpSession();
 }
 
-int ProxyResolverWinHttp::GetProxyConfig(ProxyConfig* config) {
-  WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ie_config = {0};
-  if (!WinHttpGetIEProxyConfigForCurrentUser(&ie_config)) {
-    LOG(ERROR) << "WinHttpGetIEProxyConfigForCurrentUser failed: " <<
-        GetLastError();
-    return ERR_FAILED;  // TODO(darin): Bug 1189288: translate error code.
-  }
-
-  if (ie_config.fAutoDetect)
-    config->auto_detect = true;
-  if (ie_config.lpszProxy)
-    config->proxy_server = WideToASCII(ie_config.lpszProxy);
-  if (ie_config.lpszProxyBypass) {
-    std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass);
-    
-    StringTokenizer proxy_server_bypass_list(proxy_bypass, "; \t\n\r");
-    while (proxy_server_bypass_list.GetNext()) {
-      std::string bypass_url_domain = proxy_server_bypass_list.token();
-      if (bypass_url_domain == "<local>")
-        config->proxy_bypass_local_names = true;
-      else
-        config->proxy_bypass.push_back(bypass_url_domain);
-    }
-  }
-  if (ie_config.lpszAutoConfigUrl)
-    config->pac_url = GURL(ie_config.lpszAutoConfigUrl);
-
-  FreeConfig(&ie_config);
-  return OK;
-}
-
 int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url,
                                          const GURL& pac_url,
                                          ProxyInfo* results) {
   // 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
@@ skipping 77 matching lines @@
 
 void ProxyResolverWinHttp::CloseWinHttpSession() {
   if (session_handle_) {
     WinHttpCloseHandle(session_handle_);
     session_handle_ = NULL;
   }
 }
 
 }  // namespace net