Translate Saved/StaticIPConfig properties from ONC to Shill

chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

 // Copyright 2014 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/ui/webui/chromeos/network_config_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 134 matching lines @@
 }
 
 void NetworkConfigMessageHandler::GetPropertiesSuccess(
     int callback_id,
     const std::string& service_path,
     const base::DictionaryValue& dictionary) const {
   base::ListValue return_arg_list;
   return_arg_list.AppendInteger(callback_id);
 
   base::DictionaryValue* network_properties = dictionary.DeepCopy();
+  // Set the 'ServicePath' property for debugging.
   network_properties->SetStringWithoutPathExpansion(
-      ::onc::network_config::kGUID, service_path);
+      "ServicePath", service_path);
+
   return_arg_list.Append(network_properties);
   InvokeCallback(return_arg_list);
 }
 
 void NetworkConfigMessageHandler::GetShillProperties(
     const base::ListValue* arg_list) {
   int callback_id = 0;
   std::string guid;
   if (!arg_list->GetInteger(0, &callback_id) ||
       !arg_list->GetString(1, &guid)) {
@@ skipping 11 matching lines @@
                  weak_ptr_factory_.GetWeakPtr(), callback_id),
       base::Bind(&NetworkConfigMessageHandler::ErrorCallback,
                  weak_ptr_factory_.GetWeakPtr(), callback_id));
 }
 
 void NetworkConfigMessageHandler::GetShillPropertiesSuccess(
     int callback_id,
     const std::string& service_path,
     const base::DictionaryValue& dictionary) const {
   scoped_ptr<base::DictionaryValue> dictionary_copy(dictionary.DeepCopy());
+  // Set the 'ServicePath' property for debugging.
+  dictionary_copy->SetStringWithoutPathExpansion("ServicePath", service_path);
 
   // Get the device properties for debugging.
   std::string device;
   dictionary_copy->GetStringWithoutPathExpansion(
       shill::kDeviceProperty, &device);
   const DeviceState* device_state =
       NetworkHandler::Get()->network_state_handler()->GetDeviceState(device);
   if (device_state) {
     base::DictionaryValue* device_dictionary =
         device_state->properties().DeepCopy();
     dictionary_copy->Set(shill::kDeviceProperty, device_dictionary);
+
+    // Convert IPConfig dictionary to a ListValue.
+    base::ListValue* ip_configs = new base::ListValue;
+    for (base::DictionaryValue::Iterator iter(device_state->ip_configs());
+         !iter.IsAtEnd(); iter.Advance()) {
+      ip_configs->Append(iter.value().DeepCopy());
+    }
+    device_dictionary->SetWithoutPathExpansion(
+        shill::kIPConfigsProperty, ip_configs);
   }
-  GetPropertiesSuccess(callback_id, service_path, *dictionary_copy);
+
+  base::ListValue return_arg_list;
+  return_arg_list.AppendInteger(callback_id);
+  return_arg_list.Append(dictionary_copy.release());
+  InvokeCallback(return_arg_list);
 }
 
 void NetworkConfigMessageHandler::InvokeCallback(
     const base::ListValue& arg_list) const {
   web_ui()->CallJavascriptFunction(
       "networkConfig.chromeCallbackSuccess", arg_list);
 }
 
 void NetworkConfigMessageHandler::ErrorCallback(
     int callback_id,
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) const {
   LOG(ERROR) << "NetworkConfigMessageHandler Error: " << error_name;
   base::ListValue arg_list;
   arg_list.AppendInteger(callback_id);
   arg_list.AppendString(error_name);
   web_ui()->CallJavascriptFunction(
       "networkConfig.chromeCallbackError", arg_list);
 }
 
 }  // namespace chromeos