Index: ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
index c46b83c54856c3f1e7cb8e153d5839cc05913417..4c8ceb92e7f4ff3a795345cd50559c4b52c2744b 100644 |
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
@@ -702,9 +702,10 @@ TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenTouchConsumed) { |
PushGesture(ET_GESTURE_SCROLL_BEGIN); |
MoveTouchPoint(0, 2, 2); |
SendTouchConsumedAck(); |
- EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL), |
- GetAndResetSentGestures())); |
- EXPECT_EQ(LastSentGestureLocation(), gfx::PointF(2, 2)); |
+ EXPECT_TRUE( |
+ GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL, ET_GESTURE_SCROLL_BEGIN), |
+ GetAndResetSentGestures())); |
+ EXPECT_EQ(LastSentGestureLocation(), gfx::PointF(1, 1)); |
} |
TEST_F(TouchDispositionGestureFilterTest, |
@@ -1011,16 +1012,18 @@ TEST_F(TouchDispositionGestureFilterTest, TestDisallowedMultiFingerSwipe) { |
PushGesture(ET_GESTURE_SCROLL_BEGIN); |
MoveTouchPoint(0, 0, 0); |
SendTouchConsumedAck(); |
- EXPECT_FALSE(GesturesSent()); |
+ EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN), |
+ GetAndResetSentGestures())); |
PushGesture(ET_GESTURE_PINCH_BEGIN); |
PressTouchPoint(1, 1); |
SendTouchNotConsumedAck(); |
- EXPECT_FALSE(GesturesSent()); |
+ EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_BEGIN), |
+ GetAndResetSentGestures())); |
PushGesture(ET_GESTURE_SWIPE); |
PressTouchPoint(1, 1); |
- SendTouchNotConsumedAck(); |
+ SendTouchConsumedAck(); |
EXPECT_FALSE(GesturesSent()); |
} |