Add hooks for flushing input from BeginFrame dispatch on Aura

content/browser/renderer_host/input/input_router_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <math.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 278 matching lines @@
   }
 
   bool TouchEventQueueEmpty() const {
     return input_router()->touch_event_queue_.empty();
   }
 
   bool TouchEventTimeoutEnabled() const {
     return input_router()->touch_event_queue_.IsAckTimeoutEnabled();
   }
 
-  void RequestNotificationWhenFlushed() const {
-    return input_router_->RequestNotificationWhenFlushed();
+  void FlushInput() const {
+    return input_router_->FlushInput(base::TimeTicks::Now());
   }
 
   size_t GetAndResetDidFlushCount() {
     return client_->GetAndResetDidFlushCount();
   }
 
   bool HasPendingEvents() const {
     return input_router_->HasPendingEvents();
   }
 
@@ skipping 1247 matching lines @@
   SendInputEventACK(WebInputEvent::GestureTap, INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_EQ(0, client_->in_flight_event_count());
 }
 
 // Test that the router will call the client's |DidFlush| after all events have
 // been dispatched following a call to |Flush|.
 TEST_F(InputRouterImplTest, InputFlush) {
   EXPECT_FALSE(HasPendingEvents());
 
   // Flushing an empty router should immediately trigger DidFlush.
-  RequestNotificationWhenFlushed();
+  FlushInput();
   EXPECT_EQ(1U, GetAndResetDidFlushCount());
   EXPECT_FALSE(HasPendingEvents());
 
   // Queue a TouchStart.
   OnHasTouchEventHandlers(true);
   PressTouchPoint(1, 1);
   uint32 touch_press_event_id = SendTouchEvent();
   EXPECT_TRUE(HasPendingEvents());
 
   // DidFlush should be called only after the event is ack'ed.
-  RequestNotificationWhenFlushed();
+  FlushInput();
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
   SendTouchEventACK(WebInputEvent::TouchStart,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED, touch_press_event_id);
   EXPECT_EQ(1U, GetAndResetDidFlushCount());
 
   // Ensure different types of enqueued events will prevent the DidFlush call
   // until all such events have been fully dispatched.
   MoveTouchPoint(0, 50, 50);
   uint32 touch_move_event_id = SendTouchEvent();
   ASSERT_TRUE(HasPendingEvents());
   SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
                        blink::WebGestureDeviceTouchscreen);
   SimulateGestureEvent(WebInputEvent::GestureScrollUpdate,
                        blink::WebGestureDeviceTouchscreen);
   SimulateGestureEvent(WebInputEvent::GesturePinchBegin,
                        blink::WebGestureDeviceTouchscreen);
   SimulateGestureEvent(WebInputEvent::GesturePinchUpdate,
                        blink::WebGestureDeviceTouchscreen);
-  RequestNotificationWhenFlushed();
+  FlushInput();
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
 
   // Repeated flush calls should have no effect.
-  RequestNotificationWhenFlushed();
+  FlushInput();
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
 
   // There are still pending gestures.
   SendTouchEventACK(WebInputEvent::TouchMove,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED, touch_move_event_id);
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
   EXPECT_TRUE(HasPendingEvents());
 
   // One more gesture to go.
   SendInputEventACK(WebInputEvent::GestureScrollUpdate,
@@ skipping 14 matching lines @@
   EXPECT_FALSE(HasPendingEvents());
 
   // Simulate a fling.
   SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
                        blink::WebGestureDeviceTouchscreen);
   SimulateGestureEvent(WebInputEvent::GestureFlingStart,
                        blink::WebGestureDeviceTouchscreen);
   EXPECT_TRUE(HasPendingEvents());
 
   // If the fling is unconsumed, the flush is complete.
-  RequestNotificationWhenFlushed();
+  FlushInput();
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
   SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
                        blink::WebGestureDeviceTouchscreen);
   SendInputEventACK(WebInputEvent::GestureFlingStart,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   EXPECT_FALSE(HasPendingEvents());
   EXPECT_EQ(1U, GetAndResetDidFlushCount());
 
   // Simulate a second fling.
   SimulateGestureEvent(WebInputEvent::GestureFlingStart,
                        blink::WebGestureDeviceTouchscreen);
   EXPECT_TRUE(HasPendingEvents());
 
   // If the fling is consumed, the flush is complete only when the renderer
   // reports that is has ended.
-  RequestNotificationWhenFlushed();
+  FlushInput();
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
   SendInputEventACK(WebInputEvent::GestureFlingStart,
                     INPUT_EVENT_ACK_STATE_CONSUMED);
   EXPECT_TRUE(HasPendingEvents());
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
 
   // The fling end notification should signal that the router is flushed.
   input_router()->OnMessageReceived(InputHostMsg_DidStopFlinging(0));
   EXPECT_EQ(1U, GetAndResetDidFlushCount());
 
   // Even flings consumed by the client require a fling-end notification.
   client_->set_filter_state(INPUT_EVENT_ACK_STATE_CONSUMED);
   SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
                        blink::WebGestureDeviceTouchscreen);
   SimulateGestureEvent(WebInputEvent::GestureFlingStart,
                        blink::WebGestureDeviceTouchscreen);
   ASSERT_TRUE(HasPendingEvents());
-  RequestNotificationWhenFlushed();
+  FlushInput();
   EXPECT_EQ(0U, GetAndResetDidFlushCount());
   input_router()->OnMessageReceived(InputHostMsg_DidStopFlinging(0));
   EXPECT_EQ(1U, GetAndResetDidFlushCount());
 }
 
 // Test that GesturePinchUpdate is handled specially for trackpad
 TEST_F(InputRouterImplTest, TouchpadPinchUpdate) {
   // GesturePinchUpdate for trackpad sends synthetic wheel events.
   // Note that the Touchscreen case is verified as NOT doing this as
   // part of the ShowPressIsInOrder test.
@@ skipping 129 matching lines @@
   client_overscroll = client_->GetAndResetOverscroll();
   EXPECT_EQ(wheel_overscroll.accumulated_overscroll,
             client_overscroll.accumulated_overscroll);
   EXPECT_EQ(wheel_overscroll.latest_overscroll_delta,
             client_overscroll.latest_overscroll_delta);
   EXPECT_EQ(wheel_overscroll.current_fling_velocity,
             client_overscroll.current_fling_velocity);
 }
 
 }  // namespace content