Reland: Change to Shill's IPConfig objects.

chromeos/network/onc/onc_translation_tables.cc

Index: chromeos/network/onc/onc_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index 5124c022884d98c31085248b43a6ee226cdf11ba..3e22de3aa7c4f58b00166d9456e1b124ef44bc42 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -207,20 +207,11 @@ const FieldTranslationEntry ipconfig_fields[] = {
       shill::kWebProxyAutoDiscoveryUrlProperty},
     {NULL}};
 
-const FieldTranslationEntry saved_ipconfig_fields[] = {
-    { ::onc::ipconfig::kIPAddress, shill::kSavedIPAddressProperty},
-    { ::onc::ipconfig::kGateway, shill::kSavedIPGatewayProperty},
-    { ::onc::ipconfig::kRoutingPrefix, shill::kSavedIPPrefixlenProperty},
-    // NameServers are converted during translation, see onc_translator_*.
-    // { ::onc::ipconfig::kNameServers, shill::kSavedIPNameServersProperty},
-    {NULL}};
-
-const FieldTranslationEntry static_ipconfig_fields[] = {
-    { ::onc::ipconfig::kIPAddress, shill::kStaticIPAddressProperty},
-    { ::onc::ipconfig::kGateway, shill::kStaticIPGatewayProperty},
-    { ::onc::ipconfig::kRoutingPrefix, shill::kStaticIPPrefixlenProperty},
-    // NameServers are converted during translation, see onc_translator_*.
-    // { ::onc::ipconfig::kNameServers, shill::kStaticIPNameServersProperty},
+const FieldTranslationEntry static_or_saved_ipconfig_fields[] = {
+    { ::onc::ipconfig::kIPAddress, shill::kAddressProperty},
+    { ::onc::ipconfig::kGateway, shill::kGatewayProperty},
+    { ::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
+    { ::onc::ipconfig::kNameServers, shill::kNameServersProperty},
     {NULL}};
 
 struct OncValueTranslationEntry {
@@ -249,8 +240,8 @@ const OncValueTranslationEntry onc_value_translation_table[] = {
   { &kNetworkWithStateSignature, network_fields },
   { &kNetworkConfigurationSignature, network_fields },
   { &kIPConfigSignature, ipconfig_fields },
-  { &kSavedIPConfigSignature, saved_ipconfig_fields },
-  { &kStaticIPConfigSignature, static_ipconfig_fields },
+  { &kSavedIPConfigSignature, static_or_saved_ipconfig_fields },
+  { &kStaticIPConfigSignature, static_or_saved_ipconfig_fields },
   { NULL }
 };
 
@@ -260,13 +251,19 @@ struct NestedShillDictionaryEntry {
   const char* const* shill_property_path;
 };
 
-const char* cellular_apn_property_path_entries[] = {
+const char* cellular_apn_path_entries[] = {
   shill::kCellularApnProperty,
   NULL
 };
 
+const char* static_ip_config_path_entries[] = {
+  shill::kStaticIPConfigProperty,
+  NULL
+};
+
 const NestedShillDictionaryEntry nested_shill_dictionaries[] = {
-  { &kCellularApnSignature, cellular_apn_property_path_entries },
+  { &kCellularApnSignature, cellular_apn_path_entries },
+  { &kStaticIPConfigSignature, static_ip_config_path_entries },
   { NULL }
 };