Grab SOCKS settings from system prefs....

Grab SOCKS settings from system prefs.

BUG=http://crbug.com/13423
TEST=test SOCKS (ssh -D) proxying


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=31594

[Avi (use Gerrit), 2009-11-10 20:31:34]

Reviewers: Mark Mentovai,

Description:
Grab SOCKS settings from system prefs.

BUG=http://crbug.com/13423
TEST=test SOCKS (ssh -D) proxying


Please review this at http://codereview.chromium.org/383010

SVN Base: svn://chrome-svn/chrome/trunk/src/

Affected files:
   M     net/proxy/proxy_resolver_mac.cc


Index: net/proxy/proxy_resolver_mac.cc
===================================================================
--- net/proxy/proxy_resolver_mac.cc	(revision 31560)
+++ net/proxy/proxy_resolver_mac.cc	(working copy)
@@ -165,7 +165,7 @@
        config->pac_url = GURL(base::SysCFStringRefToUTF8(pac_url_ref));
    }

-  // proxies (for now only ftp, http and https)
+  // proxies (for now ftp, http, https, and SOCKS)

    if (GetBoolFromDictionary(config_dict.get(),
                              kSCPropNetProxiesFTPEnable,
@@ -206,6 +206,19 @@
        config->proxy_rules.proxy_for_https = proxy_server;
      }
    }
+  if (GetBoolFromDictionary(config_dict.get(),
+                            kSCPropNetProxiesSOCKSEnable,
+                            false)) {
+    ProxyServer proxy_server =
+        GetProxyServerFromDictionary(ProxyServer::SCHEME_SOCKS5,
+                                     config_dict.get(),
+                                     kSCPropNetProxiesSOCKSProxy,
+                                     kSCPropNetProxiesSOCKSPort);
+    if (proxy_server.is_valid()) {
+      config->proxy_rules.type =  
ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
+      config->proxy_rules.socks_proxy = proxy_server;
+    }
+  }

    // proxy bypass list

[Mark Mentovai, 2009-11-10 20:33:36]

LGTM

[Mark Mentovai, 2009-11-10 20:33:54]

LGTM

http://codereview.chromium.org/383010