Make the ContentGestureProvider a ui::FilteredGestureProvider

ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc

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 a38dc95e4fad7e163afc085c78a94f7171c96aac..ef5ae9a5df5a952aa50cdffd6b7364b92b624b41 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
@@ -117,21 +117,16 @@ class TouchDispositionGestureFilterTest
     return queue_->OnGesturePacket(packet);
   }
 
-  void SendTouchEventACK(
-      TouchDispositionGestureFilter::TouchEventAck ack_result) {
-    queue_->OnTouchEventAck(ack_result);
+  void SendTouchEventAck(bool event_consumed) {
+    queue_->OnTouchEventAck(event_consumed);
   }
 
   void SendTouchConsumedAck() {
-    SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+    SendTouchEventAck(true);
   }
 
-  void SendNotConsumedAck() {
-    SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
-  }
-
-  void SendNoConsumerExistsAck() {
-    SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  void SendTouchNotConsumedAck() {
+    SendTouchEventAck(false);
   }
 
   void PushGesture(GestureEventType type) {
@@ -194,13 +189,13 @@ TEST_F(TouchDispositionGestureFilterTest, BasicNoGestures) {
 
   // No gestures should be dispatched by the ack, as the queued packets
   // contained no gestures.
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   // Release the touch gesture.
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
@@ -209,7 +204,7 @@ TEST_F(TouchDispositionGestureFilterTest, BasicGestures) {
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
   EXPECT_FALSE(GesturesSent());
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
 
@@ -218,7 +213,7 @@ TEST_F(TouchDispositionGestureFilterTest, BasicGestures) {
   PushGesture(GESTURE_FLING_CANCEL);
   ReleaseTouchPoint();
   EXPECT_FALSE(GesturesSent());
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_FLING_START,
                                      GESTURE_FLING_CANCEL),
                             GetAndResetSentGestures()));
@@ -228,13 +223,13 @@ TEST_F(TouchDispositionGestureFilterTest, BasicGesturesConsumed) {
   // A consumed touch's gesture should not be sent.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_FLING_START);
   PushGesture(GESTURE_FLING_CANCEL);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
@@ -242,19 +237,19 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedThenNotConsumed) {
   // A consumed touch's gesture should not be sent.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   // Even if the subsequent touch is not consumed, continue dropping gestures.
   PushGesture(GESTURE_SCROLL_UPDATE);
   MoveTouchPoint(0, 2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   // Even if the subsequent touch had no consumer, continue dropping gestures.
   PushGesture(GESTURE_FLING_START);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
@@ -262,33 +257,33 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenConsumed) {
   // A not consumed touch's gesture should be sent.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
 
   // A newly consumed gesture should not be sent.
   PushGesture(GESTURE_PINCH_BEGIN);
   PressTouchPoint(10, 10);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   // And subsequent non-consumed pinch updates should not be sent.
   PushGesture(GESTURE_SCROLL_UPDATE);
   PushGesture(GESTURE_PINCH_UPDATE);
   MoveTouchPoint(0, 2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_UPDATE),
                             GetAndResetSentGestures()));
 
   // End events dispatched only when their start events were.
   PushGesture(GESTURE_PINCH_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_SCROLL_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
 }
@@ -297,26 +292,26 @@ TEST_F(TouchDispositionGestureFilterTest, ScrollAlternatelyConsumed) {
   // A consumed touch's gesture should not be sent.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
 
   for (size_t i = 0; i < 3; ++i) {
     PushGesture(GESTURE_SCROLL_UPDATE);
     MoveTouchPoint(0, 2, 2);
-    SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+    SendTouchConsumedAck();
     EXPECT_FALSE(GesturesSent());
 
     PushGesture(GESTURE_SCROLL_UPDATE);
     MoveTouchPoint(0, 3, 3);
-    SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+    SendTouchNotConsumedAck();
     EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_UPDATE),
                               GetAndResetSentGestures()));
   }
 
   PushGesture(GESTURE_SCROLL_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
 }
@@ -325,7 +320,7 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
   // An unconsumed touch's gesture should be sent.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
 
@@ -333,7 +328,7 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
   // pressed but not on a touch handling rect), send the gesture.
   PushGesture(GESTURE_PINCH_BEGIN);
   PressTouchPoint(2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_PINCH_BEGIN),
                             GetAndResetSentGestures()));
 
@@ -341,13 +336,13 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
   // of the ack state.
   PushGesture(GESTURE_PINCH_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_PINCH_END),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_SCROLL_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
 }
@@ -355,20 +350,20 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
 TEST_F(TouchDispositionGestureFilterTest, EndingEventsSent) {
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_PINCH_BEGIN);
   PressTouchPoint(2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_PINCH_BEGIN),
                             GetAndResetSentGestures()));
 
   // Consuming the touchend event can't suppress the match end gesture.
   PushGesture(GESTURE_PINCH_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_PINCH_END),
                             GetAndResetSentGestures()));
 
@@ -376,20 +371,20 @@ TEST_F(TouchDispositionGestureFilterTest, EndingEventsSent) {
   PushGesture(GESTURE_SCROLL_UPDATE);
   PushGesture(GESTURE_SCROLL_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
 
   // GESTURE_SCROLL_END and GESTURE_FLING_START behave the same in this regard.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_FLING_START);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_FLING_START),
                             GetAndResetSentGestures()));
 }
@@ -398,71 +393,71 @@ TEST_F(TouchDispositionGestureFilterTest, EndingEventsNotSent) {
   // Consuming a begin event ensures no end events are sent.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_PINCH_BEGIN);
   PressTouchPoint(2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_PINCH_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_SCROLL_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
 TEST_F(TouchDispositionGestureFilterTest, UpdateEventsSuppressedPerEvent) {
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
 
   // Consuming a single scroll or pinch update should suppress only that event.
   PushGesture(GESTURE_SCROLL_UPDATE);
   MoveTouchPoint(0, 2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_PINCH_BEGIN);
   PressTouchPoint(2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_PINCH_BEGIN),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_PINCH_UPDATE);
   MoveTouchPoint(1, 2, 3);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   // Subsequent updates should not be affected.
   PushGesture(GESTURE_SCROLL_UPDATE);
   MoveTouchPoint(0, 4, 4);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_UPDATE),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_PINCH_UPDATE);
   MoveTouchPoint(0, 4, 5);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_PINCH_UPDATE),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_PINCH_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_PINCH_END),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_SCROLL_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
 }
@@ -470,34 +465,34 @@ TEST_F(TouchDispositionGestureFilterTest, UpdateEventsSuppressedPerEvent) {
 TEST_F(TouchDispositionGestureFilterTest, UpdateEventsDependOnBeginEvents) {
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   // Scroll and pinch gestures depend on the scroll begin gesture being
   // dispatched.
   PushGesture(GESTURE_SCROLL_UPDATE);
   MoveTouchPoint(0, 2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_PINCH_BEGIN);
   PressTouchPoint(2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_PINCH_UPDATE);
   MoveTouchPoint(1, 2, 3);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_PINCH_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_SCROLL_END);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
@@ -513,13 +508,13 @@ TEST_F(TouchDispositionGestureFilterTest, MultipleTouchSequences) {
   ReleaseTouchPoint();
 
   // The first gesture sequence should not be allowed.
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchConsumedAck();
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   // The subsequent sequence should "reset" allowance.
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN,
                                      GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
@@ -529,22 +524,22 @@ TEST_F(TouchDispositionGestureFilterTest, FlingCancelledOnNewTouchSequence) {
   // Simulate a fling.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
   PushGesture(GESTURE_FLING_START);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_FLING_START),
                             GetAndResetSentGestures()));
 
   // A new touch seqeuence should cancel the outstanding fling.
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_FLING_CANCEL),
                             GetAndResetSentGestures()));
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
@@ -552,15 +547,15 @@ TEST_F(TouchDispositionGestureFilterTest, ScrollEndedOnNewTouchSequence) {
   // Simulate a scroll.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
 
   // A new touch seqeuence should end the outstanding scroll.
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
 }
@@ -570,7 +565,7 @@ TEST_F(TouchDispositionGestureFilterTest, FlingCancelledOnScrollBegin) {
   PushGesture(GESTURE_SCROLL_BEGIN);
   PushGesture(GESTURE_FLING_START);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN,
                                      GESTURE_FLING_START),
                             GetAndResetSentGestures()));
@@ -579,7 +574,7 @@ TEST_F(TouchDispositionGestureFilterTest, FlingCancelledOnScrollBegin) {
   PushGesture(GESTURE_SCROLL_BEGIN);
   PushGesture(GESTURE_FLING_START);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_FLING_CANCEL,
                                      GESTURE_SCROLL_BEGIN,
                                      GESTURE_FLING_START),
@@ -590,13 +585,13 @@ TEST_F(TouchDispositionGestureFilterTest, FlingNotCancelledIfGFCEventReceived) {
   // Simulate a fling that is started then cancelled.
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   PushGesture(GESTURE_FLING_START);
   MoveTouchPoint(0, 1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   PushGesture(GESTURE_FLING_CANCEL);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN,
                                      GESTURE_FLING_START,
                                      GESTURE_FLING_CANCEL),
@@ -605,23 +600,23 @@ TEST_F(TouchDispositionGestureFilterTest, FlingNotCancelledIfGFCEventReceived) {
   // A new touch sequence will not inject a GESTURE_FLING_CANCEL, as the fling
   // has already been cancelled.
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
 TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenScrollBegins) {
   PushGesture(GESTURE_TAP_DOWN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_DOWN),
                             GetAndResetSentGestures()));
 
   // If the subsequent touch turns into a scroll, the tap should be cancelled.
   PushGesture(GESTURE_SCROLL_BEGIN);
   MoveTouchPoint(0, 2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_CANCEL,
                                      GESTURE_SCROLL_BEGIN),
                             GetAndResetSentGestures()));
@@ -630,14 +625,14 @@ TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenScrollBegins) {
 TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenTouchConsumed) {
   PushGesture(GESTURE_TAP_DOWN);
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_DOWN),
                             GetAndResetSentGestures()));
 
   // If the subsequent touch is consumed, the tap should be cancelled.
   PushGesture(GESTURE_SCROLL_BEGIN);
   MoveTouchPoint(0, 2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_CANCEL),
                             GetAndResetSentGestures()));
 }
@@ -647,20 +642,20 @@ TEST_F(TouchDispositionGestureFilterTest,
   PushGesture(GESTURE_TAP_DOWN);
   PressTouchPoint(1, 1);
   PressTouchPoint(2, 2);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_DOWN),
                             GetAndResetSentGestures()));
 
   PushGesture(GESTURE_TAP);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP),
                             GetAndResetSentGestures()));
 
   // The tap should not be cancelled as it was terminated by a |GESTURE_TAP|.
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
@@ -668,7 +663,7 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
   // If the sequence is allowed, and there are no preceding gestures, the
   // timeout gestures should be forwarded immediately.
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   SendTimeoutGesture(GESTURE_SHOW_PRESS);
@@ -680,18 +675,18 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
                             GetAndResetSentGestures()));
 
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
 
   // If the sequence is disallowed, and there are no preceding gestures, the
   // timeout gestures should be dropped immediately.
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   SendTimeoutGesture(GESTURE_SHOW_PRESS);
   EXPECT_FALSE(GesturesSent());
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
 
   // If the sequence has a pending ack, the timeout gestures should
   // remain queued until the ack is received.
@@ -701,7 +696,7 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
   SendTimeoutGesture(GESTURE_LONG_PRESS);
   EXPECT_FALSE(GesturesSent());
 
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_LONG_PRESS),
                             GetAndResetSentGestures()));
 }
@@ -709,15 +704,15 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
 TEST_F(TouchDispositionGestureFilterTest, SpuriousAcksIgnored) {
   // Acks received when the queue is empty will be safely ignored.
   ASSERT_TRUE(IsEmpty());
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 
   PushGesture(GESTURE_SCROLL_BEGIN);
   PressTouchPoint(1, 1);
   PushGesture(GESTURE_SCROLL_UPDATE);
   MoveTouchPoint(0, 3,3);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_SCROLL_BEGIN,
                                      GESTURE_SCROLL_UPDATE),
                             GetAndResetSentGestures()));
@@ -726,7 +721,7 @@ TEST_F(TouchDispositionGestureFilterTest, SpuriousAcksIgnored) {
   // there could be follow-up timeout events.  Spurious acks in such cases
   // should also be safely ignored.
   ASSERT_FALSE(IsEmpty());
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_FALSE(GesturesSent());
 }
 
@@ -748,7 +743,7 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedTouchCancel) {
   PushGesture(GESTURE_TAP_DOWN);
   PressTouchPoint(1, 1);
   EXPECT_FALSE(GesturesSent());
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_DOWN),
                             GetAndResetSentGestures()));
 
@@ -756,7 +751,7 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedTouchCancel) {
   PushGesture(GESTURE_SCROLL_END);
   CancelTouchPoint();
   EXPECT_FALSE(GesturesSent());
-  SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+  SendTouchConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_CANCEL,
                                      GESTURE_SCROLL_END),
                             GetAndResetSentGestures()));
@@ -764,11 +759,11 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedTouchCancel) {
 
 TEST_F(TouchDispositionGestureFilterTest, TimeoutEventAfterRelease) {
   PressTouchPoint(1, 1);
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_FALSE(GesturesSent());
   PushGesture(GESTURE_TAP_UNCONFIRMED);
   ReleaseTouchPoint();
-  SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+  SendTouchNotConsumedAck();
   EXPECT_TRUE(GesturesMatch(Gestures(GESTURE_TAP_UNCONFIRMED),
                             GetAndResetSentGestures()));