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

Unified Diff: chromeos/network/client_cert_resolver_unittest.cc

Issue 2603173002: Use TaskScheduler instead of WorkerPool in nss_cert_database.cc. (Closed)
Patch Set: Created 3 years, 12 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/network/client_cert_resolver_unittest.cc
diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc
index f64629dab784e55b8237a91d509a6eca127a13ff..7ee9cd3696548203bb5ada170d1916f4a7b37553 100644
--- a/chromeos/network/client_cert_resolver_unittest.cc
+++ b/chromeos/network/client_cert_resolver_unittest.cc
@@ -16,6 +16,7 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
+#include "base/test/scoped_task_scheduler.h"
#include "base/test/simple_test_clock.h"
#include "base/values.h"
#include "chromeos/cert_loader.h"
@@ -56,7 +57,8 @@ class ClientCertResolverTest : public testing::Test,
: network_properties_changed_count_(0),
service_test_(nullptr),
profile_test_(nullptr),
- cert_loader_(nullptr) {}
+ cert_loader_(nullptr),
+ scoped_task_scheduler_(&message_loop_) {}
~ClientCertResolverTest() override {}
void SetUp() override {
@@ -66,7 +68,6 @@ class ClientCertResolverTest : public testing::Test,
test_nsscertdb_.reset(new net::NSSCertDatabaseChromeOS(
crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())),
crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot()))));
- test_nsscertdb_->SetSlowTaskRunnerForTest(message_loop_.task_runner());
DBusThreadManager::Initialize();
service_test_ =
@@ -293,6 +294,7 @@ class ClientCertResolverTest : public testing::Test,
std::unique_ptr<ManagedNetworkConfigurationHandlerImpl>
managed_config_handler_;
base::MessageLoop message_loop_;
+ base::test::ScopedTaskScheduler scoped_task_scheduler_;
scoped_refptr<net::X509Certificate> test_client_cert_;
std::string test_ca_cert_pem_;
crypto::ScopedTestNSSDB test_nssdb_;

Powered by Google App Engine
This is Rietveld 408576698