| 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 06576480f7a6c4eb15a87b3965e7bb724550807b..d1fd90458537cef045f5a57fb4067c94ac0c9a17 100644
|
| --- a/chromeos/network/client_cert_resolver_unittest.cc
|
| +++ b/chromeos/network/client_cert_resolver_unittest.cc
|
| @@ -16,8 +16,9 @@
|
| #include "base/macros.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/test/simple_test_clock.h"
|
| +#include "base/threading/thread_task_runner_handle.h"
|
| #include "base/values.h"
|
| #include "chromeos/cert_loader.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| @@ -53,7 +54,7 @@ const char* kUserHash = "user_hash";
|
| class ClientCertResolverTest : public testing::Test,
|
| public ClientCertResolver::Observer {
|
| public:
|
| - ClientCertResolverTest() : scoped_task_scheduler_(&message_loop_) {}
|
| + ClientCertResolverTest() = default;
|
| ~ClientCertResolverTest() override {}
|
|
|
| void SetUp() override {
|
| @@ -64,7 +65,8 @@ 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());
|
| + test_nsscertdb_->SetSlowTaskRunnerForTest(
|
| + base::ThreadTaskRunnerHandle::Get());
|
|
|
| DBusThreadManager::Initialize();
|
| service_test_ =
|
| @@ -326,8 +328,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_;
|
| + base::test::ScopedTaskEnvironment scoped_task_environment_;
|
| scoped_refptr<net::X509Certificate> test_client_cert_;
|
| std::string test_ca_cert_pem_;
|
| crypto::ScopedTestNSSDB test_nssdb_;
|
|
|