Index: content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc |
diff --git a/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc b/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc |
index 2bed8a6df6ed9f2e4443641f5418cb034b9f1559..6e3d0c195167923886cd34c4ddecd7c490daf1f5 100644 |
--- a/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc |
+++ b/content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc |
@@ -1290,37 +1290,32 @@ TEST_F(PassthroughTouchEventQueueTest, TouchMovedBeyondSlopRegionCheck) { |
// TouchMove's movedBeyondSlopRegion within the slop region is set to false. |
MoveTouchPoint(0, 0, kHalfSlopLengthDips); |
- EXPECT_EQ(1U, queued_event_count()); |
- SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
- EXPECT_EQ(1U, GetAndResetSentEventCount()); |
+ EXPECT_EQ(0U, queued_event_count()); |
+ EXPECT_EQ(0U, GetAndResetSentEventCount()); |
EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
EXPECT_FALSE(acked_event().moved_beyond_slop_region); |
MoveTouchPoint(0, kHalfSlopLengthDips, 0); |
- EXPECT_EQ(1U, queued_event_count()); |
- SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
- EXPECT_EQ(1U, GetAndResetSentEventCount()); |
+ EXPECT_EQ(0U, queued_event_count()); |
+ EXPECT_EQ(0U, GetAndResetSentEventCount()); |
EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
EXPECT_FALSE(acked_event().moved_beyond_slop_region); |
MoveTouchPoint(0, -kHalfSlopLengthDips, 0); |
- EXPECT_EQ(1U, queued_event_count()); |
- SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
- EXPECT_EQ(1U, GetAndResetSentEventCount()); |
+ EXPECT_EQ(0U, queued_event_count()); |
+ EXPECT_EQ(0U, GetAndResetSentEventCount()); |
EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
EXPECT_FALSE(acked_event().moved_beyond_slop_region); |
MoveTouchPoint(0, -kSlopLengthDips, 0); |
- EXPECT_EQ(1U, queued_event_count()); |
- SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
- EXPECT_EQ(1U, GetAndResetSentEventCount()); |
+ EXPECT_EQ(0U, queued_event_count()); |
+ EXPECT_EQ(0U, GetAndResetSentEventCount()); |
EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
EXPECT_FALSE(acked_event().moved_beyond_slop_region); |
MoveTouchPoint(0, 0, kSlopLengthDips); |
- EXPECT_EQ(1U, queued_event_count()); |
- SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
- EXPECT_EQ(1U, GetAndResetSentEventCount()); |
+ EXPECT_EQ(0U, queued_event_count()); |
+ EXPECT_EQ(0U, GetAndResetSentEventCount()); |
EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
EXPECT_FALSE(acked_event().moved_beyond_slop_region); |
@@ -1335,7 +1330,6 @@ TEST_F(PassthroughTouchEventQueueTest, TouchMovedBeyondSlopRegionCheck) { |
EXPECT_EQ(0U, GetAndResetAckedEventCount()); |
SendTouchEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
- EXPECT_TRUE(acked_event().moved_beyond_slop_region); |
} |
// Tests that even very small TouchMove's movedBeyondSlopRegion is set to true |