Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Unified Diff: chromeos/network/onc/onc_certificate_importer_impl_unittest.cc

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Flattened components/cert_database folders. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_impl.cc ('k') | chromeos/tpm_token_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4dbfbe31974c6752c9cdc3f111ff981d21dd4a8e 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/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_;
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_impl.cc ('k') | chromeos/tpm_token_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698