Extending the translation from ONC to Shill.

chrome/browser/chromeos/proxy_config_service_impl.cc

 // Copyright (c) 2012 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/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 345 matching lines @@
     }
   }
   JSONStringValueSerializer serializer(output);
   return serializer.Serialize(*dict);
 }
 
 //----------- ProxyConfigServiceImpl::ProxyConfig: private methods -------------
 
 // static
 void ProxyConfigServiceImpl::ProxyConfig::EncodeAndAppendProxyServer(
-    const std::string& scheme,
+    const std::string& url_scheme,
     const net::ProxyServer& server,
     std::string* spec) {
   if (!server.is_valid())
     return;
 
   if (!spec->empty())
     *spec += ';';
 
-  if (!scheme.empty()) {
-    *spec += scheme;
+  if (!url_scheme.empty()) {
+    *spec += url_scheme;
     *spec += "=";
   }
   *spec += server.ToURI();
 }
 
 //------------------- ProxyConfigServiceImpl: public methods -------------------
 
 ProxyConfigServiceImpl::ProxyConfigServiceImpl(PrefService* pref_service)
     : PrefProxyConfigTrackerImpl(pref_service),
       active_config_state_(ProxyPrefs::CONFIG_UNSET),
@@ skipping 453 matching lines @@
     device_config_.clear();
     return;
   }
   if (!active_network_.empty()) {
     VLOG(1) << "Try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   }
 }
 
 }  // namespace chromeos