Translate ONC ProxySettings <-> Shill ProxyConfig

chromeos/network/onc/onc_translator_onc_to_shill.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.
 
 // The implementation of TranslateONCObjectToShill is structured in two parts:
 // - The recursion through the existing ONC hierarchy
 //     see TranslateONCHierarchy
 // - The local translation of an object depending on the associated signature
 //     see LocalTranslator::TranslateFields
 
 #include "chromeos/network/onc/onc_translator.h"
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translation_tables.h"
+#include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 namespace onc {
 
 namespace {
 
 scoped_ptr<base::StringValue> ConvertValueToString(const base::Value& value) {
@@ skipping 245 matching lines @@
   onc_object_->GetStringWithoutPathExpansion(
       ::onc::network_config::kNameServersConfigType, &name_servers_config_type);
   if ((ip_address_config_type == ::onc::network_config::kIPConfigTypeDHCP) ||
       (name_servers_config_type == ::onc::network_config::kIPConfigTypeDHCP)) {
     // If either type is set to DHCP, provide an empty dictionary to ensure
     // that any unset properties are cleared. Note: if either type is specified,
     // the other type defaults to DHCP if not specified.
     shill_dictionary_->SetWithoutPathExpansion(shill::kStaticIPConfigProperty,
                                                new base::DictionaryValue);
   }
+
+  const base::DictionaryValue* proxy_settings = nullptr;
+  if (onc_object_->GetDictionaryWithoutPathExpansion(
+          ::onc::network_config::kProxySettings, &proxy_settings)) {
+    scoped_ptr<base::DictionaryValue> proxy_config =
+        ConvertOncProxySettingsToProxyConfig(*proxy_settings);
+    std::string proxy_config_str;
+    base::JSONWriter::Write(*proxy_config.get(), &proxy_config_str);
+    shill_dictionary_->SetStringWithoutPathExpansion(
+        shill::kProxyConfigProperty, proxy_config_str);
+  }
+
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::CopyFieldsAccordingToSignature() {
   for (base::DictionaryValue::Iterator it(*onc_object_); !it.IsAtEnd();
        it.Advance()) {
     AddValueAccordingToSignature(it.key(),
                                  make_scoped_ptr(it.value().DeepCopy()));
   }
 }
@@ skipping 104 matching lines @@
     const OncValueSignature* onc_signature,
     const base::DictionaryValue& onc_object) {
   CHECK(onc_signature != NULL);
   scoped_ptr<base::DictionaryValue> shill_dictionary(new base::DictionaryValue);
   TranslateONCHierarchy(*onc_signature, onc_object, shill_dictionary.get());
   return shill_dictionary.Pass();
 }
 
 }  // namespace onc
 }  // namespace chromeos