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

net/proxy/proxy_config_service_linux.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_config_service_linux.h"
 
 #include <gconf/gconf-client.h>
 #include <stdlib.h>
 
 #include "base/logging.h"
@@ skipping 37 matching lines @@
       return true;
     }
     return false;
   }
 };
 
 // Given a proxy hostname from a setting, returns that hostname with
 // an appropriate proxy server scheme prefix.
 // scheme indicates the desired proxy scheme: usually http, with
 // socks 4 or 5 as special cases.
+// TODO(arindam): Remove URI string manipulation by using MapUrlSchemeToProxy.
 std::string FixupProxyHostScheme(ProxyServer::Scheme scheme,
                                  std::string host) {
   if (scheme == ProxyServer::SCHEME_SOCKS4 &&
       StartsWithASCII(host, "socks5://", false)) {
     // We default to socks 4, but if the user specifically set it to
     // socks5://, then use that.
     scheme = ProxyServer::SCHEME_SOCKS5;
   }
   // Strip the scheme if any.
   std::string::size_type colon = host.find("://");
@@ skipping 19 matching lines @@
 
 }  // namespace
 
 bool ProxyConfigServiceLinux::Delegate::GetProxyFromEnvVarForScheme(
     const char* variable, ProxyServer::Scheme scheme,
     ProxyServer* result_server) {
   std::string env_value;
   if (env_var_getter_->Getenv(variable, &env_value)) {
     if (!env_value.empty()) {
       env_value = FixupProxyHostScheme(scheme, env_value);
-      ProxyServer proxy_server = ProxyServer::FromURI(env_value);
+      ProxyServer proxy_server =
+          ProxyServer::FromURI(env_value, ProxyServer::SCHEME_HTTP);
       if (proxy_server.is_valid() && !proxy_server.is_direct()) {
         *result_server = proxy_server;
         return true;
       } else {
         LOG(ERROR) << "Failed to parse environment variable " << variable;
       }
     }
   }
   return false;
 }
@@ skipping 271 matching lines @@
   // Check for an optional port.
   int port;
   gconf_getter_->GetInt((key + "port").c_str(), &port);
   if (port != 0) {
     // If a port is set and non-zero:
     host += ":" + IntToString(port);
   }
   host = FixupProxyHostScheme(
       is_socks ? ProxyServer::SCHEME_SOCKS4 : ProxyServer::SCHEME_HTTP,
       host);
-  ProxyServer proxy_server = ProxyServer::FromURI(host);
+  ProxyServer proxy_server = ProxyServer::FromURI(host,
+                                                  ProxyServer::SCHEME_HTTP);
   if (proxy_server.is_valid()) {
     *result_server = proxy_server;
     return true;
   }
   return false;
 }
 
 bool ProxyConfigServiceLinux::Delegate::GetConfigFromGConf(
     ProxyConfig* config) {
   std::string mode;
@@ skipping 252 matching lines @@
                              new GConfSettingGetterImpl())) {
 }
 
 ProxyConfigServiceLinux::ProxyConfigServiceLinux(
     EnvironmentVariableGetter* env_var_getter,
     GConfSettingGetter* gconf_getter)
     : delegate_(new Delegate(env_var_getter, gconf_getter)) {
 }
 
 }  // namespace net