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

chromeos/network/onc/onc_certificate_importer_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 "chrome/browser/chromeos/network_settings/onc_certificate_importer.h"
+#include "chromeos/network/onc/onc_certificate_importer.h"
 
 #include <cert.h>
+#include <certdb.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <string>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/onc_constants.h"
-#include "chrome/browser/chromeos/network_settings/onc_test_utils.h"
-#include "chrome/common/net/x509_certificate_model.h"
+#include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_test_utils.h"
 #include "crypto/nss_util.h"
 #include "net/base/cert_type.h"
 #include "net/base/crypto_module.h"
 #include "net/base/nss_cert_database.h"
 #include "net/base/x509_certificate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
-net::CertType GetCertType(const net::X509Certificate* cert) {
-  DCHECK(cert);
-  return x509_certificate_model::GetType(cert->os_cert_handle());
-}
-
-}  // namespace
-
 namespace chromeos {
 namespace onc {
 
+#if defined(USE_NSS)
+// In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use
+// the new name of the macro.
+#if !defined(CERTDB_TERMINAL_RECORD)
+#define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
+#endif
+
+net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) {
+  CERTCertTrust trust = {0};
+  CERT_GetCertTrust(cert, &trust);
+
+  unsigned all_flags = trust.sslFlags | trust.emailFlags |
+      trust.objectSigningFlags;
+
+  if (cert->nickname && (all_flags & CERTDB_USER))
+    return net::USER_CERT;
+  if ((all_flags & CERTDB_VALID_CA) || CERT_IsCACert(cert, NULL))
+    return net::CA_CERT;
+  // TODO(mattm): http://crbug.com/128633.
+  if (trust.sslFlags & CERTDB_TERMINAL_RECORD)
+    return net::SERVER_CERT;
+  return net::UNKNOWN_CERT;
+}
+#else
+net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) {
+  NOTIMPLEMENTED();
+  return net::UNKNOWN_CERT;
+}
+#endif  // USE_NSS
+
 class ONCCertificateImporterTest : public testing::Test {
  public:
   virtual void SetUp() {
     ASSERT_TRUE(test_nssdb_.is_open());
 
     slot_ = net::NSSCertDatabase::GetInstance()->GetPublicModule();
 
     // Don't run the test if the setup failed.
     ASSERT_TRUE(slot_->os_module_handle());
 
@@ skipping 14 matching lines @@
                               std::string* guid) {
     scoped_ptr<base::DictionaryValue> onc =
         test_utils::ReadTestDictionary(filename);
     base::ListValue* certificates;
     onc->GetListWithoutPathExpansion(kCertificates, &certificates);
 
     base::DictionaryValue* certificate;
     certificates->GetDictionary(0, &certificate);
     certificate->GetStringWithoutPathExpansion(kGUID, guid);
 
-    CertificateImporter importer(NetworkUIData::ONC_SOURCE_USER_IMPORT,
-                                 false /* don't allow webtrust */);
-    std::string error;
-    EXPECT_TRUE(importer.ParseAndStoreCertificates(*certificates, &error));
-    EXPECT_TRUE(error.empty());
+    CertificateImporter importer(ONC_SOURCE_USER_IMPORT,
+                                 false /* don't allow web trust */);
+    EXPECT_EQ(CertificateImporter::IMPORT_OK,
+              importer.ParseAndStoreCertificates(*certificates));
 
     net::CertificateList result_list;
     CertificateImporter::ListCertsWithNickname(*guid, &result_list);
     ASSERT_EQ(1ul, result_list.size());
-    EXPECT_EQ(expected_type, GetCertType(result_list[0].get()));
+    EXPECT_EQ(expected_type, GetCertType(result_list[0]->os_cert_handle()));
   }
 
   scoped_refptr<net::CryptoModule> slot_;
 
  private:
   net::CertificateList ListCertsInSlot(PK11SlotInfo* slot) {
     net::CertificateList result;
     CERTCertList* cert_list = PK11_ListCertsInSlot(slot);
     for (CERTCertListNode* node = CERT_LIST_HEAD(cert_list);
          !CERT_LIST_END(node, cert_list);
@@ skipping 141 matching lines @@
         std::make_pair(net::SERVER_CERT,
                        std::make_pair("certificate-server.onc",
                                       "certificate-server-update.onc")),
         std::make_pair(
             net::CA_CERT,
             std::make_pair("certificate-web-authority.onc",
                            "certificate-web-authority-update.onc"))));
 
 }  // namespace onc
 }  // namespace chromeos