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

Unified Diff: chromeos/cert_loader_unittest.cc

Issue 144423007: Make NSSCertDatabase::ListCerts work async on a worker thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to tot Created 6 years, 11 months 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
Index: chromeos/cert_loader_unittest.cc
diff --git a/chromeos/cert_loader_unittest.cc b/chromeos/cert_loader_unittest.cc
index 2f28861acd272016545c4accbf22c4feea105e03..cf7ef379e167257f7828b9620f524a2e7e0ba72b 100644
--- a/chromeos/cert_loader_unittest.cc
+++ b/chromeos/cert_loader_unittest.cc
@@ -39,6 +39,8 @@ void FailOnPrivateSlotCallback(crypto::ScopedPK11Slot slot) {
<< "though the private slot had been initialized.";
}
+} // namespace
+
class CertLoaderTest : public testing::Test,
public CertLoader::Observer {
public:
@@ -57,7 +59,6 @@ class CertLoaderTest : public testing::Test,
CertLoader::Initialize();
cert_loader_ = CertLoader::Get();
cert_loader_->AddObserver(this);
- cert_loader_->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy());
}
virtual void TearDown() {
@@ -108,6 +109,7 @@ class CertLoaderTest : public testing::Test,
database->reset(new net::NSSCertDatabaseChromeOS(
crypto::GetPublicSlotForChromeOSUser(user->username_hash()),
private_slot.Pass()));
+ (*database)->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy());
}
int GetDbPrivateSlotId(net::NSSCertDatabase* db) {
@@ -304,5 +306,4 @@ TEST_F(CertLoaderTest, UpdatedOnCACertTrustChange) {
EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
}
-} // namespace
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698