Commit 33058b2d authored by Carlos Caballero's avatar Carlos Caballero Committed by Commit Bot

Use ScopedTaskEnvironment instead of MessageLoop

MessageLoop will go away, eventually.

ScopedTaskEnvironment will per default start a ThreadPool, which should
be fine in most of the cases. If you belive your test needs to make sure
that no ThreadPool runs let me know and I will update the patch.

BUG=891670
This CL was uploaded by git cl split.

R=kylechar@chromium.org

Change-Id: I37b6144800fa6aa38d28f699a9810a08508dd963
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635818Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Auto-Submit: Carlos Caballero <carlscab@google.com>
Cr-Commit-Position: refs/heads/master@{#664730}
parent 78feb9be
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/scoped_task_environment.h"
#include "base/test/test_mock_time_task_runner.h" #include "base/test/test_mock_time_task_runner.h"
#include "services/ws/input_devices/input_device_server.h" #include "services/ws/input_devices/input_device_server.h"
#include "services/ws/public/cpp/input_devices/input_device_client.h" #include "services/ws/public/cpp/input_devices/input_device_client.h"
...@@ -42,7 +42,7 @@ class InputDeviceTest : public testing::Test { ...@@ -42,7 +42,7 @@ class InputDeviceTest : public testing::Test {
InputDeviceTest() {} InputDeviceTest() {}
~InputDeviceTest() override {} ~InputDeviceTest() override {}
void RunUntilIdle() { task_runner_->RunUntilIdle(); } void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
void AddClientAsObserver(TestInputDeviceClient* client) { void AddClientAsObserver(TestInputDeviceClient* client) {
server_.AddObserver(client->GetIntefacePtr()); server_.AddObserver(client->GetIntefacePtr());
...@@ -54,10 +54,6 @@ class InputDeviceTest : public testing::Test { ...@@ -54,10 +54,6 @@ class InputDeviceTest : public testing::Test {
// testing::Test: // testing::Test:
void SetUp() override { void SetUp() override {
task_runner_ = base::MakeRefCounted<base::TestMockTimeTaskRunner>(
base::Time::Now(), base::TimeTicks::Now());
message_loop_.SetTaskRunner(task_runner_);
ui::DeviceDataManager::CreateInstance(); ui::DeviceDataManager::CreateInstance();
server_.RegisterAsObserver(); server_.RegisterAsObserver();
} }
...@@ -65,8 +61,8 @@ class InputDeviceTest : public testing::Test { ...@@ -65,8 +61,8 @@ class InputDeviceTest : public testing::Test {
void TearDown() override { ui::DeviceDataManager::DeleteInstance(); } void TearDown() override { ui::DeviceDataManager::DeleteInstance(); }
private: private:
base::MessageLoop message_loop_; base::test::ScopedTaskEnvironment scoped_task_environment_{
scoped_refptr<base::TestMockTimeTaskRunner> task_runner_; base::test::ScopedTaskEnvironment::MainThreadType::MOCK_TIME};
InputDeviceServer server_; InputDeviceServer server_;
DISALLOW_COPY_AND_ASSIGN(InputDeviceTest); DISALLOW_COPY_AND_ASSIGN(InputDeviceTest);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment