| 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 cbcb872c8c3810db18bd5aed28d89b1d5b05a7c0..9c2a1f0470faa0e1063279b74b883d0c21581c28 100644
|
| --- a/chromeos/network/auto_connect_handler_unittest.cc
|
| +++ b/chromeos/network/auto_connect_handler_unittest.cc
|
| @@ -10,10 +10,10 @@
|
| #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"
|
| +#include "base/test/scoped_task_environment.h"
|
| +#include "base/threading/thread_task_runner_handle.h"
|
| #include "chromeos/cert_loader.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/network/client_cert_resolver.h"
|
| @@ -58,7 +58,9 @@ class TestCertResolveObserver : public ClientCertResolver::Observer {
|
|
|
| class AutoConnectHandlerTest : public NetworkStateTest {
|
| public:
|
| - AutoConnectHandlerTest() : scoped_task_scheduler_(&message_loop_) {}
|
| + AutoConnectHandlerTest()
|
| + : scoped_task_environment_(
|
| + base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
|
|
|
| void SetUp() override {
|
| ASSERT_TRUE(test_nssdb_.is_open());
|
| @@ -67,7 +69,8 @@ class AutoConnectHandlerTest : public NetworkStateTest {
|
| 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());
|
| + test_nsscertdb_->SetSlowTaskRunnerForTest(
|
| + base::ThreadTaskRunnerHandle::Get());
|
|
|
| CertLoader::Initialize();
|
| CertLoader::ForceHardwareBackedForTesting();
|
| @@ -197,10 +200,9 @@ class AutoConnectHandlerTest : public NetworkStateTest {
|
| std::unique_ptr<NetworkProfileHandler> network_profile_handler_;
|
| crypto::ScopedTestNSSDB test_nssdb_;
|
| std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_;
|
| - base::MessageLoopForUI message_loop_;
|
|
|
| private:
|
| - base::test::ScopedTaskScheduler scoped_task_scheduler_;
|
| + base::test::ScopedTaskEnvironment scoped_task_environment_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AutoConnectHandlerTest);
|
| };
|
|
|