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

Unified Diff: chromeos/network/client_cert_resolver_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/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 be02db036499539cb2e487075f0ccee0362b4ef1..0fe79c15d3a5ef685d0b8c9fb2e45cf1ff19a665 100644
--- a/chromeos/network/client_cert_resolver_unittest.cc
+++ b/chromeos/network/client_cert_resolver_unittest.cc
@@ -57,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 {
@@ -67,6 +68,7 @@ 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_ =
@@ -291,6 +293,7 @@ class ClientCertResolverTest : public testing::Test,
std::unique_ptr<NetworkConfigurationHandler> network_config_handler_;
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_;
« no previous file with comments | « chromeos/network/auto_connect_handler_unittest.cc ('k') | chromeos/network/network_cert_migrator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698