Split ProxyResolver into two interfaces:...

net/proxy/proxy_config_service_fixed.h

Index: net/proxy/proxy_config_service_fixed.h
===================================================================
--- net/proxy/proxy_config_service_fixed.h	(revision 7227)
+++ net/proxy/proxy_config_service_fixed.h	(working copy)
@@ -2,29 +2,29 @@
 // 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_FIXED_H_
-#define NET_PROXY_PROXY_RESOLVER_FIXED_H_
+#ifndef NET_PROXY_PROXY_CONFIG_SERVICE_FIXED_H_
+#define NET_PROXY_PROXY_CONFIG_SERVICE_FIXED_H_
 
 #include "net/proxy/proxy_service.h"
 
 namespace net {
 
-// Implementation of ProxyResolver that returns a fixed result.
-class ProxyResolverFixed : public ProxyResolver {
+// Implementation of ProxyConfigService that returns a fixed result.
+class ProxyConfigServiceFixed : public ProxyConfigService {
  public:
-  ProxyResolverFixed(const ProxyInfo& pi) { pi_.Use(pi); }
+  explicit ProxyConfigServiceFixed(const ProxyInfo& pi) { pi_.Use(pi); }
 
-  // ProxyResolver methods:
-  virtual int GetProxyConfig(ProxyConfig* config);
-  virtual int GetProxyForURL(const GURL& query_url,
-                             const GURL& pac_url,
-                             ProxyInfo* results);
-
+  // ProxyConfigService methods:
+  virtual int GetProxyConfig(ProxyConfig* config) {
+    config->proxy_server = pi_.proxy_server();
+    return OK;
+  }
+  
  private:
   ProxyInfo pi_;
 };
 
 }  // namespace net
 
-#endif  // NET_PROXY_PROXY_RESOLVER_FIXED_H_
+#endif  // NET_PROXY_PROXY_CONFIG_SERVICE_FIXED_H_
 
Property changes on: net\proxy\proxy_config_service_fixed.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/net/proxy/proxy_resolver_fixed.h:r69-2775