diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 15:04:42 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 15:04:42 +0000 |
| commit | ab2a2cf367a6356aad6bcd0477425322e4e04591 (patch) | |
| tree | 0cf4b68102b387e414818da35969ae82be296c0d /chrome/browser/extensions/extension_proxy_apitest.cc | |
| parent | c2f23d014bb8f371cd7b454c09c3e0bf291620e8 (diff) | |
| download | chromium_src-ab2a2cf367a6356aad6bcd0477425322e4e04591.zip chromium_src-ab2a2cf367a6356aad6bcd0477425322e4e04591.tar.gz chromium_src-ab2a2cf367a6356aad6bcd0477425322e4e04591.tar.bz2 | |
Fix handling of setting a single proxy in Proxy Settings API
Previously, setting a singleProxy entry in the Proxy Settings API meant that we set http, https, and ftp proxies individually. I.e. the Proxy settings was "http=http://foo;https=https://foo;ftp=ftp://foo". With this change it becomes "foo".
BUG=67779
TEST=none
Review URL: http://codereview.chromium.org/6312088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_proxy_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_proxy_apitest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc index 024595f..44856dd 100644 --- a/chrome/browser/extensions/extension_proxy_apitest.cc +++ b/chrome/browser/extensions/extension_proxy_apitest.cc @@ -118,12 +118,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedSingle) { PrefService* pref_service = browser()->profile()->GetPrefs(); ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, - "http=http://127.0.0.1:100;" - "https=http://127.0.0.1:100;" - "ftp=http://127.0.0.1:100;" - "socks=http://9.9.9.9", - kNoPac, - pref_service); + "127.0.0.1:100", + kNoPac, + pref_service); } // Tests setting to use the system's proxy settings. |