| Index: chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
|
| diff --git a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
|
| index 362676bc184a141bd1887992e4050d232f161ff3..8d02f0622946dee9be324743ab8aaf123deab775 100644
|
| --- a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
|
| +++ b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/values.h"
|
| #include "chromeos/network/onc/onc_test_utils.h"
|
| +#include "components/cert_database/public/cert_database_service_io_part.h"
|
| #include "components/onc/onc_constants.h"
|
| #include "crypto/scoped_test_nss_db.h"
|
| #include "net/base/crypto_module.h"
|
| @@ -60,6 +61,16 @@ net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) {
|
| }
|
| #endif // USE_NSS
|
|
|
| +class FakeCertDatabaseServiceIOPart
|
| + : public cert_database::CertDatabaseServiceIOPart {
|
| + public:
|
| + explicit FakeCertDatabaseServiceIOPart(scoped_ptr<net::NSSCertDatabase> db) {
|
| + SetNSSCertDatabase(db.Pass());
|
| + }
|
| +
|
| + ~FakeCertDatabaseServiceIOPart() override {}
|
| +};
|
| +
|
| } // namespace
|
|
|
| class ONCCertificateImporterImplTest : public testing::Test {
|
| @@ -75,9 +86,10 @@ class ONCCertificateImporterImplTest : public testing::Test {
|
| thread_task_runner_handle_.reset(
|
| new base::ThreadTaskRunnerHandle(task_runner_));
|
|
|
| - test_nssdb_.reset(new net::NSSCertDatabaseChromeOS(
|
| + scoped_ptr<net::NSSCertDatabase> nss_db(new net::NSSCertDatabaseChromeOS(
|
| crypto::ScopedPK11Slot(PK11_ReferenceSlot(public_nssdb_.slot())),
|
| crypto::ScopedPK11Slot(PK11_ReferenceSlot(private_nssdb_.slot()))));
|
| + cert_db_io_.reset(new FakeCertDatabaseServiceIOPart(nss_db.Pass()));
|
|
|
| // Test db should be empty at start of test.
|
| EXPECT_TRUE(ListCertsInPublicSlot().empty());
|
| @@ -108,7 +120,7 @@ class ONCCertificateImporterImplTest : public testing::Test {
|
| onc_certificates_.reset(certificates);
|
|
|
| web_trust_certificates_.clear();
|
| - CertificateImporterImpl importer(task_runner_, test_nssdb_.get());
|
| + CertificateImporterImpl importer(task_runner_, cert_db_io_->GetWeakPtr());
|
| importer.ImportCertificates(
|
| *certificates,
|
| ::onc::ONC_SOURCE_USER_IMPORT, // allow web trust
|
| @@ -153,7 +165,7 @@ class ONCCertificateImporterImplTest : public testing::Test {
|
|
|
| scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
|
| scoped_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
|
| - scoped_ptr<net::NSSCertDatabaseChromeOS> test_nssdb_;
|
| + scoped_ptr<FakeCertDatabaseServiceIOPart> cert_db_io_;
|
| scoped_ptr<base::ListValue> onc_certificates_;
|
| // List of certs in the nssdb's public slot.
|
| net::CertificateList public_list_;
|
|
|