This adds Cellular to the Shill to ONC translation.

chrome/browser/chromeos/cros/network_library_unittest.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 <cert.h>
 #include <pk11pub.h>
 
 #include <string>
 #include <vector>
 
@@ skipping 303 matching lines @@
   EXPECT_FALSE(wifi1->connected());
   EXPECT_TRUE(cros_->CanConnectToNetwork(wifi1));
   cros_->ConnectToWifiNetwork(wifi1);
   EXPECT_TRUE(wifi1->connected());
 }
 
 TEST_F(NetworkLibraryStubTest, NetworkConnectWifiWithCertPattern) {
   scoped_ptr<base::DictionaryValue> onc_root =
       onc::test_utils::ReadTestDictionary("toplevel_wifi_eap_clientcert.onc");
   base::ListValue* certificates;
-  onc_root->GetListWithoutPathExpansion(onc::kCertificates, &certificates);
+  onc_root->GetListWithoutPathExpansion(onc::toplevel_config::kCertificates,
+                                        &certificates);
 
   onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
                                     false /* don't allow webtrust */);
   ASSERT_EQ(onc::CertificateImporter::IMPORT_OK,
             importer.ParseAndStoreCertificates(*certificates));
 
   WifiNetwork* wifi = cros_->FindWifiNetworkByPath("wifi_cert_pattern");
 
   StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
   wifi->SetEnrollmentDelegate(enrollment_delegate);
   EXPECT_FALSE(enrollment_delegate->did_enroll);
   EXPECT_FALSE(enrollment_delegate->correct_args);
 
   ASSERT_NE(static_cast<const WifiNetwork*>(NULL), wifi);
   EXPECT_FALSE(wifi->connected());
   EXPECT_TRUE(cros_->CanConnectToNetwork(wifi));
   EXPECT_FALSE(wifi->connected());
   wifi->AttemptConnection(
       base::Bind(&WifiNetworkConnectCallback, cros_, wifi));
   EXPECT_TRUE(wifi->connected());
   EXPECT_TRUE(enrollment_delegate->did_enroll);
   EXPECT_TRUE(enrollment_delegate->correct_args);
 }
 
 TEST_F(NetworkLibraryStubTest, NetworkConnectVPNWithCertPattern) {
   scoped_ptr<base::DictionaryValue> onc_root =
       onc::test_utils::ReadTestDictionary("toplevel_openvpn_clientcert.onc");
   base::ListValue* certificates;
-  onc_root->GetListWithoutPathExpansion(onc::kCertificates, &certificates);
+  onc_root->GetListWithoutPathExpansion(onc::toplevel_config::kCertificates,
+                                        &certificates);
 
   onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
                                     false /* don't allow webtrust */);
   ASSERT_EQ(onc::CertificateImporter::IMPORT_OK,
             importer.ParseAndStoreCertificates(*certificates));
 
   VirtualNetwork* vpn = cros_->FindVirtualNetworkByPath("vpn_cert_pattern");
 
   StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
   vpn->SetEnrollmentDelegate(enrollment_delegate);
@@ skipping 71 matching lines @@
 
 TEST_P(LoadOncNetworksTest, VerifyNetworksAndCertificates) {
   LoadOncAndVerifyNetworks(GetParam().onc_file,
                            GetParam().shill_file,
                            GetParam().onc_source,
                            GetParam().expect_import_result);
 
   scoped_ptr<base::DictionaryValue> onc_dict =
       onc::test_utils::ReadTestDictionary(GetParam().onc_file);
   base::ListValue* onc_certs;
-  onc_dict->GetListWithoutPathExpansion(onc::kCertificates, &onc_certs);
+  onc_dict->GetListWithoutPathExpansion(onc::toplevel_config::kCertificates,
+                                        &onc_certs);
 
   EXPECT_EQ(onc_certs->GetSize(),
             ListCertsInSlot(slot_->os_module_handle()).size());
 }
 
 INSTANTIATE_TEST_CASE_P(
     LoadOncNetworksTest,
     LoadOncNetworksTest,
     ::testing::Values(
          ImportParams("managed_toplevel1.onc",
@@ skipping 38 matching lines @@
 
 // TODO(stevenjb): Test network profiles.
 
 // TODO(stevenjb): Test network devices.
 
 // TODO(stevenjb): Test data plans.
 
 // TODO(stevenjb): Test monitor network / device.
 
 }  // namespace chromeos