Split ProxyResolver into two interfaces:...

net/proxy/proxy_config_service_win.h

Index: net/proxy/proxy_config_service_win.h
===================================================================
--- net/proxy/proxy_config_service_win.h	(revision 7227)
+++ net/proxy/proxy_config_service_win.h	(working copy)
@@ -2,39 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_PROXY_PROXY_RESOLVER_WINHTTP_H_
-#define NET_PROXY_PROXY_RESOLVER_WINHTTP_H_
+#ifndef NET_PROXY_PROXY_CONFIG_SERVICE_WIN_H_
+#define NET_PROXY_PROXY_CONFIG_SERVICE_WIN_H_
 
 #include "net/proxy/proxy_service.h"
 
-typedef LPVOID HINTERNET;  // From winhttp.h
-
 namespace net {
 
-// An implementation of ProxyResolver that uses WinHTTP and the system
-// proxy settings.
-class ProxyResolverWinHttp : public ProxyResolver {
+// Implementation of ProxyConfigService that retrieves the system proxy
+// settings.
+class ProxyConfigServiceWin : public ProxyConfigService {
  public:
-  ProxyResolverWinHttp();
-  ~ProxyResolverWinHttp();
-
-  // ProxyResolver implementation:
+  // ProxyConfigService methods.
   virtual int GetProxyConfig(ProxyConfig* config);
-  virtual int GetProxyForURL(const GURL& query_url,
-                             const GURL& pac_url,
-                             ProxyInfo* results);
-
- private:
-   bool OpenWinHttpSession();
-   void CloseWinHttpSession();
-
-  // Proxy configuration is cached on the session handle.
-  HINTERNET session_handle_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProxyResolverWinHttp);
 };
 
 }  // namespace net
 
-#endif  // NET_PROXY_PROXY_RESOLVER_WINHTTP_H_
+#endif  // NET_PROXY_PROXY_CONFIG_SERVICE_WIN_H_
 
Property changes on: net\proxy\proxy_config_service_win.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/net/proxy/proxy_resolver_winhttp.h:r69-2775