Making command-line specified proxy settings more flexible - allowing for setting of auto-detect, pac url, per-schema proxy settings, proxy bypass urls.

BUG=http://crbug.com/266

Review URL: http://codereview.chromium.org/115029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15855 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 0 deletions

diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h
index 868fba9..b90e9b7 100644
--- a/net/proxy/proxy_config.h
+++ b/net/proxy/proxy_config.h
@@ -42,6 +42,8 @@ class ProxyConfig {
       TYPE_PROXY_PER_SCHEME,
     };
 
+    // Note that the default of TYPE_NO_RULES results in direct connections
+    // being made when using this ProxyConfig.
     ProxyRules() : type(TYPE_NO_RULES) {}
 
     bool empty() const {
@@ -91,6 +93,11 @@ class ProxyConfig {
 
   ProxyRules proxy_rules;
 
+  // Parses entries from a comma-separated list of hosts for which proxy
+  // configurations should be bypassed. Clears proxy_bypass and sets it to the
+  // resulting list.
+  void ParseNoProxyList(const std::string& no_proxy);
+
   // Indicates a list of hosts that should bypass any proxy configuration.  For
   // these hosts, a direct connection should always be used.
   // The form <host>:<port> is also supported, meaning that only
@@ -103,6 +110,10 @@ class ProxyConfig {
   // Returns true if the given config is equivalent to this config.
   bool Equals(const ProxyConfig& other) const;
 
+  // Returns true if this config could possibly require the proxy service to
+  // use a PAC resolver.
+  bool MayRequirePACResolver() const;
+
  private:
   int id_;
 };