Chromium Code Reviews| Index: chromeos/network/network_device_handler_unittest.cc |
| diff --git a/chromeos/network/network_device_handler_unittest.cc b/chromeos/network/network_device_handler_unittest.cc |
| index 863f52ce9c145db0bf7f01bd7e0e1bdc5c38a0cc..e6effc8e809ec4ef9377b0455364e51ccbbb8584 100644 |
| --- a/chromeos/network/network_device_handler_unittest.cc |
| +++ b/chromeos/network/network_device_handler_unittest.cc |
| @@ -6,8 +6,8 @@ |
| #include "base/bind.h" |
| #include "base/macros.h" |
| -#include "base/message_loop/message_loop.h" |
| #include "base/run_loop.h" |
| +#include "base/test/scoped_task_environment.h" |
| #include "base/values.h" |
| #include "chromeos/dbus/dbus_thread_manager.h" |
| #include "chromeos/dbus/fake_shill_device_client.h" |
| @@ -31,7 +31,10 @@ const char kDefaultPin[] = "1111"; |
| class NetworkDeviceHandlerTest : public testing::Test { |
| public: |
| - NetworkDeviceHandlerTest() : fake_device_client_(NULL) {} |
| + NetworkDeviceHandlerTest() |
| + : scoped_task_environment_( |
| + base::test::ScopedTaskEnvironment::MainThreadType::UI), |
| + fake_device_client_(NULL) {} |
|
stevenjb
2017/04/27 18:39:10
nit: nullptr
fdoray
2017/04/27 20:35:03
Done.
|
| ~NetworkDeviceHandlerTest() override {} |
| void SetUp() override { |
| @@ -104,7 +107,7 @@ class NetworkDeviceHandlerTest : public testing::Test { |
| FakeShillDeviceClient* fake_device_client_; |
| std::unique_ptr<NetworkDeviceHandler> network_device_handler_; |
| std::unique_ptr<NetworkStateHandler> network_state_handler_; |
| - base::MessageLoopForUI message_loop_; |
| + base::test::ScopedTaskEnvironment scoped_task_environment_; |
| base::Closure success_callback_; |
| network_handler::DictionaryResultCallback properties_success_callback_; |
| network_handler::StringResultCallback string_success_callback_; |