Translate ONC ProxySettings <-> Shill ProxyConfig

components/proxy_config/proxy_config_dictionary.cc

 // Copyright (c) 2011 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 "components/proxy_config/proxy_config_dictionary.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/values.h"
+#include "net/proxy/proxy_config.h"
 
 namespace {
 
 // Integer to specify the type of proxy settings.
 // See ProxyPrefs for possible values and interactions with the other proxy
 // preferences.
 const char kProxyMode[] = "mode";
 // String specifying the proxy server. For a specification of the expected
 // syntax see net::ProxyConfig::ProxyRules::ParseFromString().
 const char kProxyServer[] = "server";
@@ skipping 114 matching lines @@
   if (!pac_url.empty()) {
     dict->SetString(kProxyPacUrl, pac_url);
     dict->SetBoolean(kProxyPacMandatory, pac_mandatory);
   }
   if (!proxy_server.empty())
     dict->SetString(kProxyServer, proxy_server);
   if (!bypass_list.empty())
     dict->SetString(kProxyBypassList, bypass_list);
   return dict;
 }
+
+// static
+void ProxyConfigDictionary::EncodeAndAppendProxyServer(
+    const std::string& url_scheme,
+    const net::ProxyServer& server,
+    std::string* spec) {

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

why not return a string?

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

I just moved this so that it could be used outside of src/chrome; I would just
as soon not re-implement it.

+  if (!server.is_valid())
+    return;
+
+  if (!spec->empty())
+    *spec += ';';
+
+  if (!url_scheme.empty()) {
+    *spec += url_scheme;
+    *spec += "=";
+  }
+  *spec += server.ToURI();
+}