Whenever proxy configurations contain socks and http/https/ftp proxies, socks...

net/proxy/proxy_server.cc

 // Copyright (c) 2009 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 67 matching lines @@
 }
 
 std::string ProxyServer::host_and_port() const {
   // Doesn't make sense to call this if the URI scheme doesn't
   // have concept of a host.
   DCHECK(is_valid() && !is_direct());
   return host_ + ":" + IntToString(port_);
 }
 
 // static
-ProxyServer ProxyServer::FromURI(const std::string& uri) {
-  return FromURI(uri.begin(), uri.end());
+ProxyServer ProxyServer::FromURI(const std::string& uri,
+                                 Scheme default_scheme) {
+  return FromURI(uri.begin(), uri.end(), default_scheme);
 }
 
 // static
 ProxyServer ProxyServer::FromURI(std::string::const_iterator begin,
-                                 std::string::const_iterator end) {
-  // We will default to HTTP if no scheme specifier was given.
-  Scheme scheme = SCHEME_HTTP;
+                                 std::string::const_iterator end,
+                                 Scheme default_scheme) {
+  // We will default to |default_scheme| if no scheme specifier was given.
+  Scheme scheme = default_scheme;
 
   // Trim the leading/trailing whitespace.
   HttpUtil::TrimLWS(&begin, &end);
 
   // Check for [<scheme> "://"]
   std::string::const_iterator colon = std::find(begin, end, ':');
   if (colon != end &&
       (end - colon) >= 3 &&
       *(colon + 1) == '/' &&
       *(colon + 2) == '/') {
@@ skipping 106 matching lines @@
   }
 
   // Choose a default port number if none was given.
   if (port == -1)
     port = GetDefaultPortForScheme(scheme);
 
   return ProxyServer(scheme, host, port);
 }
 
 }  // namespace net