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

Unified Diff: chromeos/cert_loader_unittest.cc

Issue 2722733002: Revert of Use TaskScheduler instead of WorkerPool in nss_cert_database.cc. (Closed)
Patch Set: rebase Created 3 years, 10 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 c42722b609c22fd8990aa0b9dbf2c6bc3b17f783..6056f7675e849259dffeb2571fe9f4d9b6715198 100644
--- a/chromeos/cert_loader_unittest.cc
+++ b/chromeos/cert_loader_unittest.cc
@@ -11,8 +11,8 @@
#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
-#include "base/test/scoped_task_scheduler.h"
#include "crypto/scoped_nss_types.h"
#include "crypto/scoped_test_nss_db.h"
#include "net/cert/nss_cert_database_chromeos.h"
@@ -103,6 +103,7 @@ class CertLoaderTest : public testing::Test,
certdb->reset(new TestNSSCertDatabase(
crypto::ScopedPK11Slot(PK11_ReferenceSlot(db->slot())),
crypto::ScopedPK11Slot(PK11_ReferenceSlot(db->slot()))));
+ (*certdb)->SetSlowTaskRunnerForTest(message_loop_.task_runner());
}
void ImportCACert(const std::string& cert_file,
@@ -143,7 +144,7 @@ class CertLoaderTest : public testing::Test,
crypto::ScopedTestNSSDB primary_db_;
std::unique_ptr<TestNSSCertDatabase> primary_certdb_;
- base::test::ScopedTaskScheduler scoped_task_scheduler_;
+ base::MessageLoop message_loop_;
private:
size_t certificates_loaded_events_count_;
« no previous file with comments | « chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc ('k') | chromeos/network/auto_connect_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698