ONC: Fix Static-/Saved-/IPConfig.

chromeos/network/onc/onc_signature.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_signature.h"
 
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 152 matching lines @@
     { ::onc::vpn::kOpenVPN, &kOpenVPNSignature},
     { ::onc::vpn::kType, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature ethernet_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::ethernet::kAuthentication, &kStringSignature},
     { ::onc::ethernet::kEAP, &kEAPSignature},
     {NULL}};
 
-// Not supported for policy but for reading network state.
 const OncFieldSignature ipconfig_fields[] = {
     { ::onc::ipconfig::kGateway, &kStringSignature},
     { ::onc::ipconfig::kIPAddress, &kStringSignature},
     { ::onc::ipconfig::kNameServers, &kStringListSignature},
     { ::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
     { ::onc::network_config::kSearchDomains, &kStringListSignature},
     { ::onc::ipconfig::kType, &kStringSignature},
     { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
     {NULL}};
 
@@ skipping 98 matching lines @@
     { ::onc::cellular::kSIMPresent, &kBoolSignature},
     { ::onc::cellular::kSupportNetworkScan, &kBoolSignature},
     { ::onc::cellular::kSupportedCarriers, &kStringListSignature},
     {NULL}};
 
 const OncFieldSignature network_configuration_fields[] = {
     { ::onc::network_config::kCellular, &kCellularSignature},
     { ::onc::network_config::kEthernet, &kEthernetSignature},
     { ::onc::network_config::kGUID, &kStringSignature},
 
-    // Not supported for policy but for reading network state.
-    // TODO(pneubeck@): Resolve IPConfigs vs. StaticIPConfig, crbug.com/410877
-    { ::onc::network_config::kIPConfigs, &kIPConfigListSignature},
-
     { ::onc::network_config::kName, &kStringSignature},
 
     // Not supported, yet.
     { ::onc::network_config::kNameServers, &kStringListSignature},
 
     { ::onc::network_config::kPriority, &kIntegerSignature},
     { ::onc::network_config::kProxySettings, &kProxySettingsSignature},
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::kRemove, &kBoolSignature},
 
     // Not supported, yet.
     { ::onc::network_config::kSearchDomains, &kStringListSignature},
 
-    { ::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature},
     { ::onc::network_config::kStaticIPConfig, &kStaticIPConfigSignature},
     { ::onc::network_config::kType, &kStringSignature},
     { ::onc::network_config::kVPN, &kVPNSignature},
     { ::onc::network_config::kWiFi, &kWiFiSignature},
     {NULL}};
 
 const OncFieldSignature network_with_state_fields[] = {
     { ::onc::network_config::kCellular, &kCellularWithStateSignature},
     { ::onc::network_config::kConnectionState, &kStringSignature},
     { ::onc::network_config::kConnectable, &kBoolSignature},
     { ::onc::network_config::kErrorState, &kStringSignature},
+    { ::onc::network_config::kIPConfigs, &kIPConfigListSignature},
     { ::onc::network_config::kMacAddress, &kStringSignature},
     { ::onc::network_config::kRestrictedConnectivity, &kBoolSignature},
+    { ::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature},
     { ::onc::network_config::kWiFi, &kWiFiWithStateSignature},
     {NULL}};
 
 const OncFieldSignature global_network_configuration_fields[] = {
     { ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
       &kBoolSignature},
     {NULL}};
 
 const OncFieldSignature certificate_fields[] = {
     { ::onc::certificate::kGUID, &kStringSignature},
@@ skipping 164 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos