diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 20:24:06 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 20:24:06 +0000 |
commit | 7541206c7a5160f3489d563b97f1c841c853dc22 (patch) | |
tree | b69621265589060c0577559c23c86db4de667191 /net/proxy/proxy_config_service_common_unittest.h | |
parent | d68a04da3be6a4a5db3768f53b2b48735a6ec210 (diff) | |
download | chromium_src-7541206c7a5160f3489d563b97f1c841c853dc22.zip chromium_src-7541206c7a5160f3489d563b97f1c841c853dc22.tar.gz chromium_src-7541206c7a5160f3489d563b97f1c841c853dc22.tar.bz2 |
Split out the handling of proxy bypass rules into ProxyBypassRules. There are some pretty complicated rules, and this helps isolate that code and better test it.
This also lays a framework for addressing bug 9835 (IP/CIDR matching)
Lastly, adds support for the exclusion format ".domain" on all platforms, which is interpreted as "*.domain".
BUG=28112
TEST=ProxyBypassRulesTest.*
Review URL: http://codereview.chromium.org/601070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_common_unittest.h')
-rw-r--r-- | net/proxy/proxy_config_service_common_unittest.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/proxy/proxy_config_service_common_unittest.h b/net/proxy/proxy_config_service_common_unittest.h index 783fc6f..66ddfa6 100644 --- a/net/proxy/proxy_config_service_common_unittest.h +++ b/net/proxy/proxy_config_service_common_unittest.h @@ -14,6 +14,8 @@ namespace net { +class ProxyBypassRules; + ProxyConfig::ProxyRules MakeProxyRules( ProxyConfig::ProxyRules::Type type, const char* single_proxy, @@ -35,10 +37,8 @@ ProxyConfig::ProxyRules MakeProxyPerSchemeRules( const char* proxy_ftp, const char* socks_proxy); -typedef std::vector<std::string> BypassList; - // Joins the proxy bypass list using "\n" to make it into a single string. -std::string FlattenProxyBypass(const BypassList& proxy_bypass); +std::string FlattenProxyBypass(const ProxyBypassRules& bypass_rules); } // namespace net |