This moves the ONC parsing code into chromeos/network/onc

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>
 
 #include "base/at_exit.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros/onc_constants.h"
 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
-#include "chrome/browser/chromeos/network_settings/onc_certificate_importer.h"
-#include "chrome/browser/chromeos/network_settings/onc_utils.h"
 #include "chrome/common/chrome_paths.h"
+#include "chromeos/network/onc/onc_certificate_importer.h"
+#include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_utils.h"
 #include "crypto/nss_util.h"
 #include "net/base/crypto_module.h"
 #include "net/base/nss_cert_database.h"
 #include "net/base/x509_certificate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
 
 namespace chromeos {
@@ skipping 114 matching lines @@
   virtual void TearDown() {
     cros_ = NULL;
     EXPECT_TRUE(CleanupSlotContents(slot_->os_module_handle()));
     EXPECT_EQ(0U, ListCertsInSlot(slot_->os_module_handle()).size());
   }
 
   virtual void GetTestData(const std::string& filename,
                            scoped_ptr<base::ListValue>* certificates,
                            scoped_ptr<base::ListValue>* network_configs) {
       FilePath path;
-      std::string error;
       PathService::Get(chrome::DIR_TEST_DATA, &path);
       path = path.AppendASCII("chromeos").AppendASCII("cros").Append(filename);
       ASSERT_TRUE(file_util::PathExists(path))
         << "Couldn't find test data file " << path.value();
       std::string contents;
       ASSERT_TRUE(file_util::ReadFileToString(path, &contents))
         << "Unable to read test data file " << path.value();
 
       scoped_ptr<base::DictionaryValue> root =
-          onc::ReadDictionaryFromJson(contents, &error);
-      CHECK(root.get() != NULL) << "ONC is not a valid json dictionary: "
-                                << error;
+          onc::ReadDictionaryFromJson(contents);
+      CHECK(root.get() != NULL) << "ONC is not a valid JSON dictionary.";
 
       base::ListValue* certificates_ptr;
       CHECK(root->GetListWithoutPathExpansion(onc::kCertificates,
                                               &certificates_ptr));
       certificates->reset(certificates_ptr->DeepCopy());
 
       base::ListValue* network_configs_ptr;
       CHECK(root->GetListWithoutPathExpansion(onc::kNetworkConfigurations,
                                               &network_configs_ptr));
       network_configs->reset(network_configs_ptr->DeepCopy());
@@ skipping 115 matching lines @@
   cros_->ConnectToWifiNetwork(wifi1);
   EXPECT_TRUE(wifi1->connected());
 }
 
 TEST_F(NetworkLibraryStubTest, NetworkConnectOncWifi) {
   // Import a wireless network via loading an ONC file.
   scoped_ptr<base::ListValue> network_configs;
   scoped_ptr<base::ListValue> certificates;
   GetTestData("cert-pattern.onc", &certificates, &network_configs);
 
-  onc::CertificateImporter importer(NetworkUIData::ONC_SOURCE_USER_IMPORT,
+  onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
                                     false /* don't allow webtrust */);
-  EXPECT_TRUE(importer.ParseAndStoreCertificates(*certificates, NULL));
+  EXPECT_EQ(onc::CertificateImporter::IMPORT_OK,
+            importer.ParseAndStoreCertificates(*certificates));
 
   OncNetworkParser parser(*network_configs,
-                          NetworkUIData::ONC_SOURCE_USER_IMPORT);
+                          onc::ONC_SOURCE_USER_IMPORT);
   ASSERT_TRUE(parser.parse_error().empty());
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));
   ASSERT_TRUE(network.get());
   EXPECT_EQ(CLIENT_CERT_TYPE_PATTERN, network->client_cert_type());
 
   StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
 
   network->SetEnrollmentDelegate(enrollment_delegate);
   EXPECT_FALSE(enrollment_delegate->did_enroll);
@@ skipping 10 matching lines @@
   EXPECT_TRUE(enrollment_delegate->did_enroll);
   EXPECT_TRUE(enrollment_delegate->correct_args);
 }
 
 TEST_F(NetworkLibraryStubTest, NetworkConnectOncVPN) {
   // Import a wireless network via loading an ONC file.
   scoped_ptr<base::ListValue> network_configs;
   scoped_ptr<base::ListValue> certificates;
   GetTestData("cert-pattern-vpn.onc", &certificates, &network_configs);
 
-  onc::CertificateImporter importer(NetworkUIData::ONC_SOURCE_USER_IMPORT,
+  onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
                                     false /* don't allow webtrust */);
-  EXPECT_TRUE(importer.ParseAndStoreCertificates(*certificates, NULL));
+  EXPECT_EQ(onc::CertificateImporter::IMPORT_OK,
+            importer.ParseAndStoreCertificates(*certificates));
 
   OncNetworkParser parser(*network_configs,
-                          NetworkUIData::ONC_SOURCE_USER_IMPORT);
+                          onc::ONC_SOURCE_USER_IMPORT);
   ASSERT_TRUE(parser.parse_error().empty());
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));
   ASSERT_TRUE(network.get());
   EXPECT_EQ(CLIENT_CERT_TYPE_PATTERN, network->client_cert_type());
 
   StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
 
   network->SetEnrollmentDelegate(enrollment_delegate);
   EXPECT_FALSE(enrollment_delegate->did_enroll);
@@ skipping 26 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