This adds Cellular to the Shill to ONC translation.

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 127 matching lines @@
   ipsec->GetIntegerWithoutPathExpansion(kIKEVersion, &ike_version);
   RemoveEntryUnless(ipsec, kEAP, ike_version == 2);
   RemoveEntryUnless(ipsec, kGroup, ike_version == 1);
   RemoveEntryUnless(ipsec, kXAUTH, ike_version == 1);
 }
 
 void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
   bool remove = false;
   network->GetBooleanWithoutPathExpansion(kRemove, &remove);
   if (remove) {
-    network->RemoveWithoutPathExpansion(kIPConfigs, NULL);
-    network->RemoveWithoutPathExpansion(kName, NULL);
-    network->RemoveWithoutPathExpansion(kNameServers, NULL);
-    network->RemoveWithoutPathExpansion(kProxySettings, NULL);
-    network->RemoveWithoutPathExpansion(kSearchDomains, NULL);
-    network->RemoveWithoutPathExpansion(kType, NULL);
+    network->RemoveWithoutPathExpansion(network_config::kIPConfigs, NULL);
+    network->RemoveWithoutPathExpansion(network_config::kName, NULL);
+    network->RemoveWithoutPathExpansion(network_config::kNameServers, NULL);
+    network->RemoveWithoutPathExpansion(network_config::kProxySettings, NULL);
+    network->RemoveWithoutPathExpansion(network_config::kSearchDomains, NULL);
+    network->RemoveWithoutPathExpansion(network_config::kType, NULL);
     // Fields dependent on kType are removed afterwards, too.
   }
 
   std::string type;
-  network->GetStringWithoutPathExpansion(kType, &type);
-  RemoveEntryUnless(network, kEthernet, type == kEthernet);
-  RemoveEntryUnless(network, kVPN, type == kVPN);
-  RemoveEntryUnless(network, kWiFi, type == kWiFi);
+  network->GetStringWithoutPathExpansion(network_config::kType, &type);
+  RemoveEntryUnless(network, network_config::kEthernet,
+                    type == network_type::kEthernet);
+  RemoveEntryUnless(network, network_config::kVPN, type == network_type::kVPN);
+  RemoveEntryUnless(network, network_config::kWiFi,
+                    type == network_type::kWiFi);
 }
 
 void Normalizer::NormalizeOpenVPN(base::DictionaryValue* openvpn) {
   using namespace vpn;
 
   std::string clientcert_type;
   openvpn->GetStringWithoutPathExpansion(kClientCertType, &clientcert_type);
   RemoveEntryUnless(openvpn, kClientCertPattern,
                     clientcert_type == certificate::kPattern);
   RemoveEntryUnless(openvpn, kClientCertRef,
@@ skipping 25 matching lines @@
 
   std::string security;
   wifi->GetStringWithoutPathExpansion(wifi::kSecurity, &security);
   RemoveEntryUnless(wifi, kEAP, security == kWEP_8021X || security == kWPA_EAP);
   RemoveEntryUnless(wifi, kPassphrase,
                     security == kWEP_PSK || security == kWPA_PSK);
 }
 
 }  // namespace onc
 }  // namespace chromeos