Change the meaning of the command-line flag --proxy-server="socks://foo" to i...

net/proxy/proxy_server.cc

 // Copyright (c) 2010 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.
 
 #include "net/proxy/proxy_server.h"
 
 #include <algorithm>
 
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
@@ skipping 32 matching lines @@
 // Parse the proxy scheme from a URL-like representation, to a
 // ProxyServer::Scheme.  This corresponds with the values used in
 // ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
 ProxyServer::Scheme GetSchemeFromURI(std::string::const_iterator begin,
                                      std::string::const_iterator end) {
   if (LowerCaseEqualsASCII(begin, end, "http"))
     return ProxyServer::SCHEME_HTTP;
   if (LowerCaseEqualsASCII(begin, end, "socks4"))
     return ProxyServer::SCHEME_SOCKS4;
   if (LowerCaseEqualsASCII(begin, end, "socks"))
-    return ProxyServer::SCHEME_SOCKS4;
+    return ProxyServer::SCHEME_SOCKS5;
   if (LowerCaseEqualsASCII(begin, end, "socks5"))
     return ProxyServer::SCHEME_SOCKS5;
   if (LowerCaseEqualsASCII(begin, end, "direct"))
     return ProxyServer::SCHEME_DIRECT;
   if (LowerCaseEqualsASCII(begin, end, "https"))
     return ProxyServer::SCHEME_HTTPS;
   return ProxyServer::SCHEME_INVALID;
 }
 
 std::string HostNoBrackets(const std::string& host) {
@@ skipping 165 matching lines @@
     if (port == -1)
       port = GetDefaultPortForScheme(scheme);
 
     host_port_pair = HostPortPair(HostNoBrackets(host), port);
   }
 
   return ProxyServer(scheme, host_port_pair);
 }
 
 }  // namespace net