This adds Cellular to the Shill to ONC translation.

chrome/browser/chromeos/cros/network_library_impl_base.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 "chrome/browser/chromeos/cros/network_library_impl_base.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 1073 matching lines @@
   scoped_ptr<base::DictionaryValue> root_dict =
       onc::ReadDictionaryFromJson(onc_blob);
   if (root_dict.get() == NULL) {
     LOG(ERROR) << "ONC loaded from " << onc::GetSourceAsString(source)
                << " is not a valid JSON dictionary.";
     return false;
   }
 
   // Check and see if this is an encrypted ONC file. If so, decrypt it.
   std::string onc_type;
-  root_dict->GetStringWithoutPathExpansion(onc::kType, &onc_type);
-  if (onc_type == onc::kEncryptedConfiguration) {
+  root_dict->GetStringWithoutPathExpansion(onc::network_config::kType,
+                                           &onc_type);
+  if (onc_type == onc::toplevel_config::kEncryptedConfiguration) {
     root_dict = onc::Decrypt(passphrase, *root_dict);
     if (root_dict.get() == NULL) {
       LOG(ERROR) << "Couldn't decrypt the ONC from "
                  << onc::GetSourceAsString(source);
       return false;
     }
   }
 
   // Validate the ONC dictionary. We are liberal and ignore unknown field
   // names and ignore invalid field names in kRecommended arrays.
@@ skipping 21 matching lines @@
     success = false;
   } else if (validation_result == onc::Validator::INVALID ||
              root_dict == NULL) {
     LOG(ERROR) << "ONC from " << onc::GetSourceAsString(source)
                << " is invalid and couldn't be repaired.";
     return false;
   }
 
   const base::ListValue* certificates;
   bool has_certificates =
-      root_dict->GetListWithoutPathExpansion(onc::kCertificates, &certificates);
+      root_dict->GetListWithoutPathExpansion(
+          onc::toplevel_config::kCertificates,
+          &certificates);
 
   const base::ListValue* network_configs;
   bool has_network_configurations = root_dict->GetListWithoutPathExpansion(
-      onc::kNetworkConfigurations,
+      onc::toplevel_config::kNetworkConfigurations,
       &network_configs);
 
   if (has_certificates) {
     VLOG(2) << "ONC file has " << certificates->GetSize() << " certificates";
 
     onc::CertificateImporter cert_importer(source, allow_web_trust_from_policy);
     if (cert_importer.ParseAndStoreCertificates(*certificates) !=
         onc::CertificateImporter::IMPORT_OK) {
       LOG(ERROR) << "Cannot parse some of the certificates in the ONC from "
                  << onc::GetSourceAsString(source);
       success = false;
     }
   }
 
   std::set<std::string> removal_ids;
   std::set<std::string>& network_ids(network_source_map_[source]);
   network_ids.clear();
   if (has_network_configurations) {
     VLOG(2) << "ONC file has " << network_configs->GetSize() << " networks";
     for (base::ListValue::const_iterator it(network_configs->begin());
          it != network_configs->end(); ++it) {
       const base::DictionaryValue* network;
       (*it)->GetAsDictionary(&network);
 
       bool marked_for_removal = false;
       network->GetBooleanWithoutPathExpansion(onc::kRemove,
                                               &marked_for_removal);
 
       std::string type;
-      network->GetStringWithoutPathExpansion(onc::kType, &type);
+      network->GetStringWithoutPathExpansion(onc::network_config::kType, &type);
 
       std::string guid;
-      network->GetStringWithoutPathExpansion(onc::kGUID, &guid);
+      network->GetStringWithoutPathExpansion(onc::network_config::kGUID, &guid);
 
       if (source == onc::ONC_SOURCE_USER_IMPORT && marked_for_removal) {
         // User import supports the removal of networks by ID.
         removal_ids.insert(guid);
         continue;
       }
 
       // Don't configure a network that is supposed to be removed. For
       // policy-managed networks, the "remove" functionality of ONC is
       // irrelevant. Instead, in general, all previously configured networks
@@ skipping 20 matching lines @@
                                      *expanded_network);
 
       // Configure the network.
       scoped_ptr<base::DictionaryValue> shill_dict =
           onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,
                                          *normalized_network);
 
       // Set the ProxyConfig.
       const base::DictionaryValue* proxy_settings;
       if (normalized_network->GetDictionaryWithoutPathExpansion(
-              onc::kProxySettings,
+              onc::network_config::kProxySettings,
               &proxy_settings)) {
         scoped_ptr<base::DictionaryValue> proxy_config =
             onc::ConvertOncProxySettingsToProxyConfig(*proxy_settings);
         std::string proxy_json;
         base::JSONWriter::Write(proxy_config.get(), &proxy_json);
         shill_dict->SetStringWithoutPathExpansion(
             flimflam::kProxyConfigProperty,
             proxy_json);
       }
 
       // Set the UIData.
       scoped_ptr<NetworkUIData> ui_data =
           onc::CreateUIData(source, *normalized_network);
       base::DictionaryValue ui_data_dict;
       ui_data->FillDictionary(&ui_data_dict);
       std::string ui_data_json;
       base::JSONWriter::Write(&ui_data_dict, &ui_data_json);
       shill_dict->SetStringWithoutPathExpansion(flimflam::kUIDataProperty,
                                                 ui_data_json);
 
       // Set the appropriate profile for |source|.
       if (profile != NULL) {
         shill_dict->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
                                                   profile->path);
       }
 
       // For Ethernet networks, apply them to the current Ethernet service.
-      if (type == onc::kEthernet) {
+      if (type == onc::network_type::kEthernet) {
         const EthernetNetwork* ethernet = ethernet_network();
         if (ethernet) {
           CallConfigureService(ethernet->unique_id(), shill_dict.get());
         } else {
           LOG(WARNING) << "Tried to import ONC with an Ethernet network when "
                        << "there is no active Ethernet connection.";
         }
       } else {
         CallConfigureService(guid, shill_dict.get());
       }
@@ skipping 532 matching lines @@
   GetTpmInfo();
   return tpm_slot_;
 }
 
 const std::string& NetworkLibraryImplBase::GetTpmPin() {
   GetTpmInfo();
   return tpm_pin_;
 }
 
 }  // namespace chromeos