Commit 0ae2bcb3 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Backport some tests in /content/browser/renderer_host/input to SingleThreadTaskEnvironment

These tests were previously migrated from single-threaded MessageLoop to
a multi-threaded TaskEnvironment (then named ScopedTaskEnvironment) as
part of crbug.com/891670.

//base OWNERS decided in retrospect that it was better to keep a
single-threaded option for TaskEnvironment and introduced
SingleThreadTaskEnvironment. This CL retrofits that decision for
/content/browser/renderer_host/input.

This CL is a no-op if it passes CQ.

This CL was uploaded by git cl split.

R=tdresser@chromium.org

Bug: 891670
Change-Id: I178884fcf70f05b71f828abb8c5648fb187d99ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786781
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarTimothy Dresser <tdresser@chromium.org>
Commit-Queue: Timothy Dresser <tdresser@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693933}
parent 921ce8a5
......@@ -39,7 +39,8 @@ class GestureEventQueueTest : public testing::Test,
public FlingControllerSchedulerClient {
public:
GestureEventQueueTest()
: task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
: task_environment_(
base::test::SingleThreadTaskEnvironment::MainThreadType::UI),
acked_gesture_event_count_(0),
sent_gesture_event_count_(0) {}
......@@ -220,7 +221,7 @@ class GestureEventQueueTest : public testing::Test,
}
private:
base::test::TaskEnvironment task_environment_;
base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<GestureEventQueue> queue_;
size_t acked_gesture_event_count_;
size_t sent_gesture_event_count_;
......
......@@ -205,7 +205,8 @@ class MockInputRouterImplClient : public InputRouterImplClient {
class InputRouterImplTestBase : public testing::Test {
public:
InputRouterImplTestBase()
: task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
: task_environment_(
base::test::SingleThreadTaskEnvironment::MainThreadType::UI) {}
~InputRouterImplTestBase() override {}
......@@ -498,7 +499,7 @@ class InputRouterImplTestBase : public testing::Test {
std::unique_ptr<MockInputDispositionHandler> disposition_handler_;
private:
base::test::TaskEnvironment task_environment_;
base::test::SingleThreadTaskEnvironment task_environment_;
SyntheticWebTouchEvent touch_event_;
};
......
......@@ -145,7 +145,8 @@ class MouseWheelEventQueueTest : public testing::Test,
public MouseWheelEventQueueClient {
public:
MouseWheelEventQueueTest()
: task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
: task_environment_(
base::test::SingleThreadTaskEnvironment::MainThreadType::UI),
acked_event_count_(0),
last_acked_event_state_(INPUT_EVENT_ACK_STATE_UNKNOWN) {
queue_.reset(new MouseWheelEventQueue(this));
......@@ -375,7 +376,7 @@ class MouseWheelEventQueueTest : public testing::Test,
EXPECT_EQ(1U, GetAndResetSentEventCount());
}
base::test::TaskEnvironment task_environment_;
base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<MouseWheelEventQueue> queue_;
std::vector<std::unique_ptr<WebInputEvent>> sent_events_;
size_t acked_event_count_;
......
......@@ -47,7 +47,8 @@ class PassthroughTouchEventQueueTest : public testing::Test,
public PassthroughTouchEventQueueClient {
public:
PassthroughTouchEventQueueTest()
: task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
: task_environment_(
base::test::SingleThreadTaskEnvironment::MainThreadType::UI),
acked_event_count_(0),
last_acked_event_state_(INPUT_EVENT_ACK_STATE_UNKNOWN),
slop_length_dips_(0) {}
......@@ -340,7 +341,7 @@ class PassthroughTouchEventQueueTest : public testing::Test,
queue_->OnHasTouchEventHandlers(true);
}
base::test::TaskEnvironment task_environment_;
base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<PassthroughTouchEventQueue> queue_;
size_t acked_event_count_;
WebTouchEvent last_acked_event_;
......
......@@ -32,7 +32,8 @@ class TouchEmulatorTest : public testing::Test,
public TouchEmulatorClient {
public:
TouchEmulatorTest()
: task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
: task_environment_(
base::test::SingleThreadTaskEnvironment::MainThreadType::UI),
last_event_time_(base::TimeTicks::Now()),
event_time_delta_(base::TimeDelta::FromMilliseconds(100)),
shift_pressed_(false),
......@@ -253,7 +254,7 @@ class TouchEmulatorTest : public testing::Test,
float GetCursorScaleFactor() { return cursor_.info().image_scale_factor; }
private:
base::test::TaskEnvironment task_environment_;
base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<TouchEmulator> emulator_;
std::vector<WebInputEvent::Type> forwarded_events_;
base::TimeTicks last_event_time_;
......
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