Chrome could not accept IE's proxy exclusions list delimited by commas.

This change add comma to delimiters list.

BUG=76168
TEST=net_unittests --gtest_filter=ProxyConfigServiceWinTest.*
Review URL: http://codereview.chromium.org/6878016

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

2 files changed, 19 insertions, 4 deletions

diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc
index 0d581ea..0334723 100644
--- a/net/proxy/proxy_config_service_win.cc
+++ b/net/proxy/proxy_config_service_win.cc
@@ -179,7 +179,7 @@ void ProxyConfigServiceWin::SetFromIEConfig(
   if (ie_config.lpszProxyBypass) {
     std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass);
 
-    StringTokenizer proxy_server_bypass_list(proxy_bypass, "; \t\n\r");
+    StringTokenizer proxy_server_bypass_list(proxy_bypass, ";, \t\n\r");
     while (proxy_server_bypass_list.GetNext()) {
       std::string bypass_url_domain = proxy_server_bypass_list.token();
       config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
diff --git a/net/proxy/proxy_config_service_win_unittest.cc b/net/proxy/proxy_config_service_win_unittest.cc
index 72b49cf..1bdf8b8 100644
--- a/net/proxy/proxy_config_service_win_unittest.cc
+++ b/net/proxy/proxy_config_service_win_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -142,7 +142,7 @@ TEST(ProxyConfigServiceWinTest, SetFromIEConfig) {
       ProxyRulesExpectation::EmptyWithBypass("<local>"),
     },
 
-    // Bypass "google.com" and local names, using semicolon as delimeter
+    // Bypass "google.com" and local names, using semicolon as delimiter
     // (ignoring white space).
     {
       { // Input.
@@ -158,7 +158,7 @@ TEST(ProxyConfigServiceWinTest, SetFromIEConfig) {
       ProxyRulesExpectation::EmptyWithBypass("<local>,google.com"),
     },
 
-    // Bypass "foo.com" and "google.com", using lines as delimeter.
+    // Bypass "foo.com" and "google.com", using lines as delimiter.
     {
       { // Input.
         TRUE,                      // fAutoDetect
@@ -172,6 +172,21 @@ TEST(ProxyConfigServiceWinTest, SetFromIEConfig) {
       GURL(),                     // pac_url
       ProxyRulesExpectation::EmptyWithBypass("foo.com,google.com"),
     },
+
+    // Bypass "foo.com" and "google.com", using commas as delimiter.
+    {
+      { // Input.
+        TRUE,                      // fAutoDetect
+        NULL,                      // lpszAutoConfigUrl
+        NULL,                      // lpszProxy
+        L"foo.com, google.com",    // lpszProxy_bypass
+      },
+
+      // Expected result.
+      true,                       // auto_detect
+      GURL(),                     // pac_url
+      ProxyRulesExpectation::EmptyWithBypass("foo.com,google.com"),
+    },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {