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

Unified Diff: chromeos/network/auto_connect_handler_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/auto_connect_handler_unittest.cc
diff --git a/chromeos/network/auto_connect_handler_unittest.cc b/chromeos/network/auto_connect_handler_unittest.cc
index acbcbcdeff77493834dc8614de0ab12ded392ffa..872c271a765dc772810c016ebd05c653037c2b4f 100644
--- a/chromeos/network/auto_connect_handler_unittest.cc
+++ b/chromeos/network/auto_connect_handler_unittest.cc
@@ -14,6 +14,7 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_scheduler.h"
#include "base/strings/stringprintf.h"
#include "chromeos/cert_loader.h"
#include "chromeos/dbus/dbus_thread_manager.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_) {}
Ryan Sleevi 2017/01/27 00:51:59 It strikes me as profoundly surprising to see new
fdoray 2017/02/02 17:56:32 New ScopedTaskScheduler documentation addresses th
void SetUp() override {
ASSERT_TRUE(test_nssdb_.is_open());
@@ -86,7 +89,6 @@ 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();
@@ -251,6 +253,7 @@ class AutoConnectHandlerTest : public testing::Test {
crypto::ScopedTestNSSDB test_nssdb_;
std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_;
base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskScheduler scoped_task_scheduler_;
private:
DISALLOW_COPY_AND_ASSIGN(AutoConnectHandlerTest);

Powered by Google App Engine
This is Rietveld 408576698