Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(568)

Unified Diff: net/proxy/proxy_config_service_linux_unittest.cc

Issue 3413037: Change the default SOCKS version used by gnome settings (and environment vari... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_linux_unittest.cc
===================================================================
--- net/proxy/proxy_config_service_linux_unittest.cc (revision 60502)
+++ net/proxy/proxy_config_service_linux_unittest.cc (working copy)
@@ -581,7 +581,7 @@
false, // auto_detect
GURL(), // pac_url
ProxyRulesExpectation::Single(
- "socks4://socks.com:99", // single proxy
+ "socks5://socks.com:99", // single proxy
"") // bypass rules
},
@@ -824,12 +824,12 @@
false, // auto_detect
GURL(), // pac_url
ProxyRulesExpectation::Single(
- "socks4://socks.com:888", // single proxy
+ "socks5://socks.com:888", // single proxy
""), // bypass rules
},
{
- TEST_DESC("socks5"),
+ TEST_DESC("socks4"),
{ // Input.
NULL, // DESKTOP_SESSION
NULL, // HOME
@@ -838,7 +838,7 @@
NULL, // auto_proxy
"", // all_proxy
NULL, NULL, NULL, // per-proto proxies
- "socks.com:888", "5", // SOCKS
+ "socks.com:888", "4", // SOCKS
NULL, // no_proxy
},
@@ -846,7 +846,7 @@
false, // auto_detect
GURL(), // pac_url
ProxyRulesExpectation::Single(
- "socks5://socks.com:888", // single proxy
+ "socks4://socks.com:888", // single proxy
""), // bypass rules
},
@@ -868,7 +868,7 @@
false, // auto_detect
GURL(), // pac_url
ProxyRulesExpectation::Single(
- "socks4://socks.com:1080", // single proxy
+ "socks5://socks.com:1080", // single proxy
""), // bypass rules
},
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698