Revert of Change to Shill's IPConfig objects.

chromeos/network/onc/onc_translation_tables.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_translation_tables.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "components/onc/onc_constants.h"
@@ skipping 189 matching lines @@
     { ::onc::ipconfig::kGateway, shill::kGatewayProperty},
     { ::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
     { ::onc::ipconfig::kNameServers, shill::kNameServersProperty},
     // This field is converted during translation, see ShillToONCTranslator::
     // TranslateIPConfig. It is only converted from Shill->ONC.
     // { ::onc::ipconfig::kType, shill::kMethodProperty},
     { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl,
       shill::kWebProxyAutoDiscoveryUrlProperty},
     {NULL}};
 
-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},
+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},
     {NULL}};
 
 struct OncValueTranslationEntry {
   const OncValueSignature* onc_signature;
   const FieldTranslationEntry* field_translation_table;
 };
 
 const OncValueTranslationEntry onc_value_translation_table[] = {
   { &kEAPSignature, eap_fields },
   { &kIPsecSignature, ipsec_fields },
   { &kL2TPSignature, l2tp_fields },
   { &kXAUTHSignature, xauth_fields },
   { &kOpenVPNSignature, openvpn_fields },
   { &kVerifyX509Signature, verify_x509_fields },
   { &kVPNSignature, vpn_fields },
   { &kWiFiSignature, wifi_fields },
   { &kWiFiWithStateSignature, wifi_fields },
   { &kWiMAXSignature, wimax_fields },
   { &kWiMAXWithStateSignature, wimax_fields },
   { &kCellularApnSignature, cellular_apn_fields },
   { &kCellularFoundNetworkSignature, cellular_found_network_fields },
   { &kCellularProviderSignature, cellular_provider_fields },
   { &kSIMLockStatusSignature, sim_lock_status_fields },
   { &kCellularSignature, cellular_fields },
   { &kCellularWithStateSignature, cellular_fields },
   { &kNetworkWithStateSignature, network_fields },
   { &kNetworkConfigurationSignature, network_fields },
   { &kIPConfigSignature, ipconfig_fields },
-  { &kSavedIPConfigSignature, static_or_saved_ipconfig_fields },
-  { &kStaticIPConfigSignature, static_or_saved_ipconfig_fields },
+  { &kSavedIPConfigSignature, saved_ipconfig_fields },
+  { &kStaticIPConfigSignature, static_ipconfig_fields },
   { NULL }
 };
 
 struct NestedShillDictionaryEntry {
   const OncValueSignature* onc_signature;
   // NULL terminated list of Shill property keys.
   const char* const* shill_property_path;
 };
 
-const char* cellular_apn_path_entries[] = {
+const char* cellular_apn_property_path_entries[] = {
   shill::kCellularApnProperty,
   NULL
 };
 
-const char* static_ip_config_path_entries[] = {
-  shill::kStaticIPConfigProperty,
-  NULL
-};
-
 const NestedShillDictionaryEntry nested_shill_dictionaries[] = {
-  { &kCellularApnSignature, cellular_apn_path_entries },
-  { &kStaticIPConfigSignature, static_ip_config_path_entries },
+  { &kCellularApnSignature, cellular_apn_property_path_entries },
   { NULL }
 };
 
 }  // namespace
 
 const StringTranslationEntry kNetworkTypeTable[] = {
     // This mapping is ensured in the translation code.
     //  { network_type::kEthernet, shill::kTypeEthernet },
     //  { network_type::kEthernet, shill::kTypeEthernetEap },
     { ::onc::network_type::kWiFi, shill::kTypeWifi},
@@ skipping 140 matching lines @@
       continue;
     *onc_value = table[i].onc_value;
     return true;
   }
   LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC";
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos