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

Unified Diff: net/proxy/proxy_config_service_win_unittest.cc

Issue 3388021: Change the meaning of the command-line flag --proxy-server="socks://foo" to i... (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 | « chrome/app/resources/manpage.1.in ('k') | net/proxy/proxy_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_win_unittest.cc
===================================================================
--- net/proxy/proxy_config_service_win_unittest.cc (revision 60502)
+++ net/proxy/proxy_config_service_win_unittest.cc (working copy)
@@ -103,7 +103,7 @@
""), // bypass rules
},
- // SOCKS proxy configuration
+ // SOCKS proxy configuration.
{
{ // Input.
FALSE, // fAutoDetect
@@ -114,6 +114,10 @@
},
// Expected result.
+ // Note that "socks" is interprted as meaning "socks4", since that is how
+ // Internet Explorer applies the settings. For more details on this
+ // policy, see:
+ // http://code.google.com/p/chromium/issues/detail?id=55912#c2
false, // auto_detect
GURL(), // pac_url
ProxyRulesExpectation::PerSchemeWithSocks(
« no previous file with comments | « chrome/app/resources/manpage.1.in ('k') | net/proxy/proxy_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698