ONC: Add IPAddressConfigType and NameServersConfigType

chromeos/network/onc/onc_normalizer.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_normalizer.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 139 matching lines @@
   RemoveEntryUnless(ipsec, kXAUTH, ike_version == 1);
 }
 
 void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
   bool remove = false;
   network->GetBooleanWithoutPathExpansion(::onc::kRemove, &remove);
   if (remove) {
     network->RemoveWithoutPathExpansion(::onc::network_config::kStaticIPConfig,
                                         NULL);
     network->RemoveWithoutPathExpansion(::onc::network_config::kName, NULL);
-    network->RemoveWithoutPathExpansion(::onc::network_config::kNameServers,
-                                        NULL);
     network->RemoveWithoutPathExpansion(::onc::network_config::kProxySettings,
                                         NULL);
     network->RemoveWithoutPathExpansion(::onc::network_config::kSearchDomains,
                                         NULL);
     network->RemoveWithoutPathExpansion(::onc::network_config::kType, NULL);
     // Fields dependent on kType are removed afterwards, too.
   }
 
   std::string type;
   network->GetStringWithoutPathExpansion(::onc::network_config::kType, &type);
   RemoveEntryUnless(network,
                     ::onc::network_config::kEthernet,
                     type == ::onc::network_type::kEthernet);
   RemoveEntryUnless(
       network, ::onc::network_config::kVPN, type == ::onc::network_type::kVPN);
   RemoveEntryUnless(network,
                     ::onc::network_config::kWiFi,
                     type == ::onc::network_type::kWiFi);
+
+  std::string ip_address_config_type, name_servers_config_type;
+  network->GetStringWithoutPathExpansion(
+      ::onc::network_config::kIPAddressConfigType, &ip_address_config_type);
+  network->GetStringWithoutPathExpansion(
+      ::onc::network_config::kNameServersConfigType, &name_servers_config_type);
+  RemoveEntryUnless(
+      network, ::onc::network_config::kStaticIPConfig,
+      (ip_address_config_type == ::onc::network_config::kIPConfigTypeStatic) ||
+          (name_servers_config_type ==
+           ::onc::network_config::kIPConfigTypeStatic));
 }
 
 void Normalizer::NormalizeOpenVPN(base::DictionaryValue* openvpn) {
   std::string clientcert_type;
   openvpn->GetStringWithoutPathExpansion(::onc::client_cert::kClientCertType,
                                          &clientcert_type);
   RemoveEntryUnless(openvpn,
                     ::onc::client_cert::kClientCertPattern,
                     clientcert_type == ::onc::client_cert::kPattern);
   RemoveEntryUnless(openvpn,
@@ skipping 41 matching lines @@
   std::string security;
   wifi->GetStringWithoutPathExpansion(::onc::wifi::kSecurity, &security);
   RemoveEntryUnless(wifi, kEAP, security == kWEP_8021X || security == kWPA_EAP);
   RemoveEntryUnless(wifi, kPassphrase,
                     security == kWEP_PSK || security == kWPA_PSK);
   FillInHexSSIDField(wifi);
 }
 
 }  // namespace onc
 }  // namespace chromeos