Ensure acks are sent for all blocking events.

content/renderer/input/input_event_filter_unittest.cc

Index: content/renderer/input/input_event_filter_unittest.cc
diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc
index 39bad720f4c90a6249f014131d2c6f4ae25c4ad1..9692720a81b8bcbb3b395380378530e8c1b4940a 100644
--- a/content/renderer/input/input_event_filter_unittest.cc
+++ b/content/renderer/input/input_event_filter_unittest.cc
@@ -328,19 +328,22 @@ TEST_F(InputEventFilterTest, NonBlockingWheel) {
   EXPECT_EQ(1u, message_recorder_.message_count());
 
   // Second event was queued; ack the first.
-  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::MouseWheel);
+  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::MouseWheel,
+                                   INPUT_EVENT_ACK_STATE_CONSUMED);
   base::MessageLoop::current()->RunUntilIdle();
   ASSERT_EQ(4u, ipc_sink_.message_count());
   EXPECT_EQ(2u, message_recorder_.message_count());
 
   // Third event won't be coalesced into the second because modifiers are
   // different.
-  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::MouseWheel);
+  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::MouseWheel,
+                                   INPUT_EVENT_ACK_STATE_CONSUMED);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(3u, message_recorder_.message_count());
 
   // The last events will be coalesced.
-  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::MouseWheel);
+  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::MouseWheel,
+                                   INPUT_EVENT_ACK_STATE_CONSUMED);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(3u, message_recorder_.message_count());
 
@@ -406,19 +409,22 @@ TEST_F(InputEventFilterTest, NonBlockingTouch) {
   EXPECT_EQ(1u, message_recorder_.message_count());
 
   // Second event was queued; ack the first.
-  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchStart);
+  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchStart,
+                                   INPUT_EVENT_ACK_STATE_CONSUMED);
   base::MessageLoop::current()->RunUntilIdle();
   ASSERT_EQ(4u, ipc_sink_.message_count());
   EXPECT_EQ(2u, message_recorder_.message_count());
 
   // Third event won't be coalesced into the second because modifiers are
   // different.
-  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchMove);
+  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchMove,
+                                   INPUT_EVENT_ACK_STATE_CONSUMED);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(3u, message_recorder_.message_count());
 
   // The last events will be coalesced.
-  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchMove);
+  filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchMove,
+                                   INPUT_EVENT_ACK_STATE_CONSUMED);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(3u, message_recorder_.message_count());
 
@@ -501,7 +507,8 @@ TEST_F(InputEventFilterTest, IntermingledNonBlockingTouch) {
 
   {
     // Second event was queued; ack the first.
-    filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchStart);
+    filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchStart,
+                                     INPUT_EVENT_ACK_STATE_CONSUMED);
     base::MessageLoop::current()->RunUntilIdle();
     EXPECT_EQ(2u, message_recorder_.message_count());
 
@@ -522,7 +529,8 @@ TEST_F(InputEventFilterTest, IntermingledNonBlockingTouch) {
 
   {
     // Third event should be put in the queue.
-    filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchEnd);
+    filter_->NotifyInputEventHandled(kTestRoutingID, WebInputEvent::TouchEnd,
+                                     INPUT_EVENT_ACK_STATE_CONSUMED);
     base::MessageLoop::current()->RunUntilIdle();
     EXPECT_EQ(3u, message_recorder_.message_count());