Index: content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
index ace5eb4cb62cd01b19ee5d816fb2709124cb0bf2..e799eeb8b063c51a6d2524ed9961386da282464b 100644 |
--- a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc |
@@ -145,7 +145,7 @@ |
MouseWheelEventQueueTest() |
: acked_event_count_(0), |
last_acked_event_state_(INPUT_EVENT_ACK_STATE_UNKNOWN) { |
- queue_.reset(new MouseWheelEventQueue(this, kScrollEndTimeoutMs)); |
+ SetUpForGestureTesting(false); |
} |
~MouseWheelEventQueueTest() override {} |
@@ -176,6 +176,11 @@ |
} |
protected: |
+ void SetUpForGestureTesting(bool send_gestures) { |
+ queue_.reset( |
+ new MouseWheelEventQueue(this, send_gestures, kScrollEndTimeoutMs)); |
+ } |
+ |
size_t queued_event_count() const { return queue_->queued_size(); } |
bool event_in_flight() const { return queue_->event_in_flight(); } |
@@ -430,23 +435,28 @@ |
} |
TEST_F(MouseWheelEventQueueTest, GestureSending) { |
+ SetUpForGestureTesting(true); |
GestureSendingTest(false); |
} |
TEST_F(MouseWheelEventQueueTest, GestureSendingPrecisePixels) { |
+ SetUpForGestureTesting(true); |
GestureSendingTest(false); |
} |
TEST_F(MouseWheelEventQueueTest, GestureSendingWithPhaseInformation) { |
+ SetUpForGestureTesting(true); |
PhaseGestureSendingTest(false); |
} |
TEST_F(MouseWheelEventQueueTest, |
GestureSendingWithPhaseInformationPrecisePixels) { |
+ SetUpForGestureTesting(true); |
PhaseGestureSendingTest(true); |
} |
TEST_F(MouseWheelEventQueueTest, GestureSendingInterrupted) { |
+ SetUpForGestureTesting(true); |
const WebGestureEvent::ScrollUnits scroll_units = WebGestureEvent::Pixels; |
SendMouseWheel(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, |
@@ -509,6 +519,7 @@ |
} |
TEST_F(MouseWheelEventQueueTest, GestureRailScrolling) { |
+ SetUpForGestureTesting(true); |
const WebGestureEvent::ScrollUnits scroll_units = WebGestureEvent::Pixels; |
SendMouseWheel(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, |