ONC: Add IPConfigType.

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 f93882ffd9d4730e8a6c05886034fbc556455cd9..8983b942ee42023a49824e11f9be76697b960556 100644
--- a/chromeos/network/onc/onc_normalizer.cc
+++ b/chromeos/network/onc/onc_normalizer.cc
@@ -176,6 +176,13 @@ void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
   RemoveEntryUnless(network,
                     ::onc::network_config::kWiFi,
                     type == ::onc::network_type::kWiFi);
+
+  std::string ipconfig_type;
+  network->GetStringWithoutPathExpansion(::onc::network_config::kIPConfigType,
+                                         &ipconfig_type);
+  RemoveEntryUnless(network,
+                    ::onc::network_config::kStaticIPConfig,

[pneubeck (no reviews), 2014/12/04 18:47:04]

this line should remove a 'irrelevant' StaticIPConfig in every flow that goes
through MNCH before we sent a configuration to Shill.

[stevenjb, 2014/12/04 18:54:44]

Then I'm confused why the translation of ethernet.onc doesn't fail since it
doesn't specify IPConfigType?

[stevenjb, 2014/12/05 01:11:47]

I just realized that this is potentially confusing if a configuration only
specifies specific NameServers, e.g.:

StaticIPConfig: {
  NameServers = [ "8.8.4.4" ]
}

In this case, IPConfigType will need to be 'Static', even though the IPAddress
is not set (which will cause Shill to use DHCP for the IP address). This seems
OK, and works fine for the Settings code, but we might want to make that clear
in the spec.

+                    type == ::onc::network_config::kIPConfigTypeStatic);
 }
 
 void Normalizer::NormalizeOpenVPN(base::DictionaryValue* openvpn) {