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

Unified Diff: chromeos/network/auto_connect_handler_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
« no previous file with comments | « chromeos/cert_loader_unittest.cc ('k') | chromeos/network/client_cert_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/auto_connect_handler_unittest.cc
diff --git a/chromeos/network/auto_connect_handler_unittest.cc b/chromeos/network/auto_connect_handler_unittest.cc
index 515ef5b5843aba55b6043fe7006f182ea6202610..4491a2ff63c8ab9e7b0f5fb3b04e22874fe8260f 100644
--- a/chromeos/network/auto_connect_handler_unittest.cc
+++ b/chromeos/network/auto_connect_handler_unittest.cc
@@ -12,6 +12,7 @@
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/macros.h"
+#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/test/scoped_task_scheduler.h"
@@ -77,7 +78,9 @@ class TestCertResolveObserver : public ClientCertResolver::Observer {
class AutoConnectHandlerTest : public testing::Test {
public:
AutoConnectHandlerTest()
- : test_manager_client_(nullptr), test_service_client_(nullptr) {}
+ : test_manager_client_(nullptr),
+ test_service_client_(nullptr),
+ scoped_task_scheduler_(&message_loop_) {}
void SetUp() override {
ASSERT_TRUE(test_nssdb_.is_open());
@@ -86,6 +89,7 @@ class AutoConnectHandlerTest : 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());
CertLoader::Initialize();
CertLoader::ForceHardwareBackedForTesting();
@@ -248,6 +252,7 @@ class AutoConnectHandlerTest : public testing::Test {
ShillServiceClient::TestInterface* test_service_client_;
crypto::ScopedTestNSSDB test_nssdb_;
std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_;
+ base::MessageLoopForUI message_loop_;
private:
base::test::ScopedTaskScheduler scoped_task_scheduler_;
« no previous file with comments | « chromeos/cert_loader_unittest.cc ('k') | chromeos/network/client_cert_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698