Translate ONC ProxySettings <-> Shill ProxyConfig

chromeos/network/onc/onc_translator_shill_to_onc.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 "chromeos/network/onc/onc_translator.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #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/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_util.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 {
 
 // Converts |str| to a base::Value of the given |type|. If the conversion fails,
@@ skipping 525 matching lines @@
         !name_servers->empty()) {
       onc_object_->SetStringWithoutPathExpansion(
           ::onc::network_config::kNameServersConfigType,
           ::onc::network_config::kIPConfigTypeStatic);
     }
     if (!ip_address.empty() || (name_servers && !name_servers->empty())) {
       TranslateAndAddNestedObject(::onc::network_config::kStaticIPConfig,
                                   *static_ipconfig);
     }
   }
+
+  std::string proxy_config_str;
+  if (shill_dictionary_->GetStringWithoutPathExpansion(
+          shill::kProxyConfigProperty, &proxy_config_str) &&
+      !proxy_config_str.empty()) {
+    scoped_ptr<base::DictionaryValue> proxy_config_value(
+        ReadDictionaryFromJson(proxy_config_str));

[eroman, 2015/07/08 21:26:37]

This can return NULL.

[stevenjb, 2015/07/08 22:13:07]

Good catch, added test.

+    scoped_ptr<base::DictionaryValue> proxy_settings =
+        ConvertProxyConfigToOncProxySettings(*proxy_config_value);

[eroman, 2015/07/08 21:26:37]

Note that proxy_config_value could be NULL here.

[stevenjb, 2015/07/08 22:13:08]

ConvertProxyConfigToOncProxySettings can also return null, added a test here
too.

+    onc_object_->SetWithoutPathExpansion(::onc::network_config::kProxySettings,
+                                         proxy_settings.release());
+  }
 }
 
 void ShillToONCTranslator::TranslateIPConfig() {
   CopyPropertiesAccordingToSignature();
   std::string shill_ip_method;
   shill_dictionary_->GetStringWithoutPathExpansion(shill::kMethodProperty,
                                                    &shill_ip_method);
   std::string type;
   if (shill_ip_method == shill::kTypeIPv4 ||
       shill_ip_method == shill::kTypeDHCP) {
@@ skipping 175 matching lines @@
     const NetworkState* network_state) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, onc_source, *onc_signature,
                                   network_state);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos