This adds Cellular to the Shill to ONC translation.

chromeos/network/onc/onc_utils.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_utils.h"
 
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 50 matching lines @@
   std::string ciphertext;
 
   if (!root.GetString(encrypted::kCiphertext, &ciphertext) ||
       !root.GetString(encrypted::kCipher, &cipher) ||
       !root.GetString(encrypted::kHMAC, &hmac) ||
       !root.GetString(encrypted::kHMACMethod, &hmac_method) ||
       !root.GetString(encrypted::kIV, &initial_vector) ||
       !root.GetInteger(encrypted::kIterations, &iterations) ||
       !root.GetString(encrypted::kSalt, &salt) ||
       !root.GetString(encrypted::kStretch, &stretch_method) ||
-      !root.GetString(kType, &onc_type) ||
-      onc_type != kEncryptedConfiguration) {
+      !root.GetString(toplevel_config::kType, &onc_type) ||
+      onc_type != toplevel_config::kEncryptedConfiguration) {
 
     ONC_LOG_ERROR("Encrypted ONC malformed.");
     return scoped_ptr<base::DictionaryValue>();
   }
 
   if (hmac_method != encrypted::kSHA1 ||
       cipher != encrypted::kAES256 ||
       stretch_method != encrypted::kPBKDF2) {
     ONC_LOG_ERROR("Encrypted ONC unsupported encryption scheme.");
     return scoped_ptr<base::DictionaryValue>();
@@ skipping 127 matching lines @@
     const OncFieldSignature* field_signature =
         GetFieldSignature(signature, *it);
 
     ExpandStringsInOncObject(*field_signature->value_signature,
                              substitution, inner_object);
   }
 }
 
 }  // namespace onc
 }  // namespace chromeos