ONC: Remove the top level fields NameServers and SearchDomains.

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 159 matching lines @@
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::ethernet::kAuthentication, &kStringSignature},
     { ::onc::ethernet::kEAP, &kEAPSignature},
     {NULL}};
 
 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::kSearchDomains, &kStringListSignature},
     { ::onc::ipconfig::kType, &kStringSignature},
     { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature proxy_location_fields[] = {
     { ::onc::proxy::kHost, &kStringSignature},
     { ::onc::proxy::kPort, &kIntegerSignature}, {NULL}};
 
 const OncFieldSignature proxy_manual_fields[] = {
     { ::onc::proxy::kFtp, &kProxyLocationSignature},
@@ skipping 103 matching lines @@
     { ::onc::cellular::kSIMLockStatus, &kSIMLockStatusSignature},
     { ::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},
-
     { ::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::kStaticIPConfig, &kStaticIPConfigSignature},
     { ::onc::network_config::kType, &kStringSignature},
     { ::onc::network_config::kVPN, &kVPNSignature},
     { ::onc::network_config::kWiFi, &kWiFiSignature},
     { ::onc::network_config::kWimax, &kWiMAXSignature},
     {NULL}};
 
 const OncFieldSignature network_with_state_fields[] = {
     { ::onc::network_config::kCellular, &kCellularWithStateSignature},
     { ::onc::network_config::kConnectionState, &kStringSignature},
@@ skipping 188 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos