Translate ONC ProxySettings <-> Shill ProxyConfig

chrome/browser/chromeos/ui_proxy_config.cc

 // Copyright 2013 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 "chrome/browser/chromeos/ui_proxy_config.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "net/proxy/proxy_config.h"
@@ skipping 102 matching lines @@
     }
     case MODE_SINGLE_PROXY: {
       std::string spec;
       if (single_proxy.server.is_valid())
         spec = single_proxy.server.ToURI();
       return ProxyConfigDictionary::CreateFixedServers(
           spec, bypass_rules.ToString());
     }
     case MODE_PROXY_PER_SCHEME: {
       std::string spec;
-      EncodeAndAppendProxyServer("http", http_proxy.server, &spec);
-      EncodeAndAppendProxyServer("https", https_proxy.server, &spec);
-      EncodeAndAppendProxyServer("ftp", ftp_proxy.server, &spec);
-      EncodeAndAppendProxyServer("socks", socks_proxy.server, &spec);
+      ProxyConfigDictionary::EncodeAndAppendProxyServer(
+          "http", http_proxy.server, &spec);

[jochen (gone - plz use gerrit), 2015/07/08 13:20:15]

please don't use 'http' as a string but the kHttpScheme etc.. constants

[stevenjb, 2015/07/08 16:26:14]

I just moved the function call, but I will go ahead and make the requested
changes. Done (note: no scheme is defined for "socks").

+      ProxyConfigDictionary::EncodeAndAppendProxyServer(
+          "https", https_proxy.server, &spec);
+      ProxyConfigDictionary::EncodeAndAppendProxyServer("ftp", ftp_proxy.server,
+                                                        &spec);
+      ProxyConfigDictionary::EncodeAndAppendProxyServer(
+          "socks", socks_proxy.server, &spec);
       return ProxyConfigDictionary::CreateFixedServers(
           spec, bypass_rules.ToString());
     }
     default:
       break;
   }
   NOTREACHED() << "Unrecognized proxy config mode for preference";
   return NULL;
 }
 
 UIProxyConfig::ManualProxy* UIProxyConfig::MapSchemeToProxy(
     const std::string& scheme) {
   if (scheme == "http")
     return &http_proxy;
   if (scheme == "https")
     return &https_proxy;
   if (scheme == "ftp")
     return &ftp_proxy;
   if (scheme == "socks")
     return &socks_proxy;
   NOTREACHED() << "Invalid scheme: " << scheme;
   return NULL;
 }
 
-// static
-void UIProxyConfig::EncodeAndAppendProxyServer(const std::string& url_scheme,
-                                               const net::ProxyServer& server,
-                                               std::string* spec) {
-  if (!server.is_valid())
-    return;
-
-  if (!spec->empty())
-    *spec += ';';
-
-  if (!url_scheme.empty()) {
-    *spec += url_scheme;
-    *spec += "=";
-  }
-  *spec += server.ToURI();
-}
-
 }  // namespace chromeos