diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 16:29:33 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 16:29:33 +0000 |
| commit | e84925d3e94486d97ba4c477b830ef2249cffff7 (patch) | |
| tree | 5c74000c30019350fb35fa574d31acc99bc35611 /chrome/browser/extensions/extension_proxy_apitest.cc | |
| parent | 0983c7a0180c34abe1b0d305797e538c65fce6cc (diff) | |
| download | chromium_src-e84925d3e94486d97ba4c477b830ef2249cffff7.zip chromium_src-e84925d3e94486d97ba4c477b830ef2249cffff7.tar.gz chromium_src-e84925d3e94486d97ba4c477b830ef2249cffff7.tar.bz2 | |
Migrate Proxy Settings API to net::ProxyServer
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6450006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74293 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 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc index 44856dd..b07e2cb 100644 --- a/chrome/browser/extensions/extension_proxy_apitest.cc +++ b/chrome/browser/extensions/extension_proxy_apitest.cc @@ -147,9 +147,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) { PrefService* pref_service = browser()->profile()->GetPrefs(); ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, - "http=http://1.1.1.1;" - "https=socks://2.2.2.2;" - "ftp=http://3.3.3.3:9000;" + "http=1.1.1.1:80;" // http:// is pruned. + "https=2.2.2.2:80;" // http:// is pruned. + "ftp=3.3.3.3:9000;" // http:// is pruned. "socks=socks4://4.4.4.4:9090", kNoPac, pref_service); @@ -157,9 +157,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) { // Now check the incognito preferences. pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs(); ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, - "http=http://1.1.1.1;" - "https=socks://2.2.2.2;" - "ftp=http://3.3.3.3:9000;" + "http=1.1.1.1:80;" + "https=2.2.2.2:80;" + "ftp=3.3.3.3:9000;" "socks=socks4://4.4.4.4:9090", kNoPac, pref_service); @@ -181,9 +181,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, // Now check the incognito preferences. pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs(); ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, - "http=http://1.1.1.1;" - "https=socks://2.2.2.2;" - "ftp=http://3.3.3.3:9000;" + "http=1.1.1.1:80;" + "https=socks5://2.2.2.2:1080;" // socks5 equals socks. + "ftp=3.3.3.3:9000;" "socks=socks4://4.4.4.4:9090", kNoPac, pref_service); @@ -201,9 +201,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, PrefService* pref_service = browser()->profile()->GetPrefs(); ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, - "http=http://1.1.1.1;" - "https=socks://2.2.2.2;" - "ftp=http://3.3.3.3:9000;" + "http=1.1.1.1:80;" + "https=socks5://2.2.2.2:1080;" + "ftp=3.3.3.3:9000;" "socks=socks4://4.4.4.4:9090", kNoPac, pref_service); @@ -211,9 +211,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, // Now check the incognito preferences. pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs(); ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, - "http=http://5.5.5.5;" - "https=socks://6.6.6.6;" - "ftp=http://7.7.7.7:9000;" + "http=5.5.5.5:80;" + "https=socks5://6.6.6.6:1080;" + "ftp=7.7.7.7:9000;" "socks=socks4://8.8.8.8:9090", kNoPac, pref_service); |