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_service.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_service.h')
-rw-r--r-- | net/proxy/proxy_service.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 8614d555..5798214 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -178,7 +178,6 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService>, private: friend class base::RefCountedThreadSafe<ProxyService>; - FRIEND_TEST(ProxyServiceTest, IsLocalName); FRIEND_TEST(ProxyServiceTest, UpdateConfigAfterFailedAutodetect); FRIEND_TEST(ProxyServiceTest, UpdateConfigFromPACToDirect); friend class PacRequest; @@ -253,15 +252,6 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService>, int result_code, LoadLog* load_log); - // Returns true if the URL passed in should not go through the proxy server. - // 1. If the proxy settings say to bypass local names, and |IsLocalName(url)|. - // 2. The URL matches one of the entities in the proxy bypass list. - bool ShouldBypassProxyForURL(const GURL& url); - - // Returns true if |url| is to an intranet site (using non-FQDN as the - // heuristic). - static bool IsLocalName(const GURL& url); - // NetworkChangeNotifier::Observer methods: virtual void OnIPAddressChanged(); |