Whenever proxy configurations contain socks and http/https/ftp proxies, socks...

net/proxy/proxy_config_service_common_unittest.h

Index: net/proxy/proxy_config_service_common_unittest.h
===================================================================
--- net/proxy/proxy_config_service_common_unittest.h	(revision 20189)
+++ net/proxy/proxy_config_service_common_unittest.h	(working copy)
@@ -19,7 +19,8 @@
     const char* single_proxy,
     const char* proxy_for_http,
     const char* proxy_for_https,
-    const char* proxy_for_ftp);
+    const char* proxy_for_ftp,
+    const char* socks_proxy);
 
 ProxyConfig::ProxyRules MakeSingleProxyRules(const char* single_proxy);
 
@@ -28,6 +29,12 @@
     const char* proxy_https,
     const char* proxy_ftp);
 
+ProxyConfig::ProxyRules MakeProxyPerSchemeRules(
+    const char* proxy_http,
+    const char* proxy_https,
+    const char* proxy_ftp,
+    const char* socks_proxy);

[Arindam, 2009/07/11 00:53:35]

I am wondering whether this is acceptable google code. I let
MakeProxyPerSchemeRules have an optional parameter by polymorphing it.

[eroman, 2009/07/13 23:41:31]

Yep, this is fine.

For test code, it is perfectly valid to do these sorts of things for
convenience. It for non-test code that one needs to be more skeptical of
function overloading (since it can be a source of bugs/misunderstandings).

+
 typedef std::vector<std::string> BypassList;
 
 // Joins the proxy bypass list using "\n" to make it into a single string.