ONC: Add IPAddressConfigType and NameServersConfigType

chromeos/network/onc/onc_normalizer.cc

Index: chromeos/network/onc/onc_normalizer.cc
diff --git a/chromeos/network/onc/onc_normalizer.cc b/chromeos/network/onc/onc_normalizer.cc
index 88796bf2fa83b69b5eb498613ff501b012f4e470..4ec5ddf67653d7fcdf3945a494f90d9553bea386 100644
--- a/chromeos/network/onc/onc_normalizer.cc
+++ b/chromeos/network/onc/onc_normalizer.cc
@@ -173,6 +173,19 @@ void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
   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));
+  // TODO(pneubeck): Remove fields from StaticIPConfig not specified by
+  // IP[Address|Nameservers]ConfigType.
 }
 
 void Normalizer::NormalizeOpenVPN(base::DictionaryValue* openvpn) {