Defer synthetic gesture completions until events have been flushed

content/browser/renderer_host/render_widget_host_unittest.cc

Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 54944704c2f609510091b9ed4672162a2bd1c69b..0734086d8543c74c2c8c0ade31901fde00c95575 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -218,36 +218,28 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
   }
 
   unsigned GestureEventLastQueueEventSize() const {
-    return gesture_event_queue()->coalesced_gesture_events_.size();
+    return gesture_event_queue().coalesced_gesture_events_.size();
   }
 
   WebGestureEvent GestureEventSecondFromLastQueueEvent() const {
-    return gesture_event_queue()->coalesced_gesture_events_.at(
+    return gesture_event_queue().coalesced_gesture_events_.at(
       GestureEventLastQueueEventSize() - 2).event;
   }
 
   WebGestureEvent GestureEventLastQueueEvent() const {
-    return gesture_event_queue()->coalesced_gesture_events_.back().event;
+    return gesture_event_queue().coalesced_gesture_events_.back().event;
   }
 
   unsigned GestureEventDebouncingQueueSize() const {
-    return gesture_event_queue()->debouncing_deferral_queue_.size();
+    return gesture_event_queue().debouncing_deferral_queue_.size();
   }
 
   WebGestureEvent GestureEventQueueEventAt(int i) const {
-    return gesture_event_queue()->coalesced_gesture_events_.at(i).event;
+    return gesture_event_queue().coalesced_gesture_events_.at(i).event;
   }
 
   bool ScrollingInProgress() const {
-    return gesture_event_queue()->scrolling_in_progress_;
-  }
-
-  bool FlingInProgress() const {
-    return gesture_event_queue()->fling_in_progress_;
-  }
-
-  bool WillIgnoreNextACK() const {
-    return gesture_event_queue()->ignore_next_ack_;
+    return gesture_event_queue().scrolling_in_progress_;
   }
 
   void SetupForOverscrollControllerTest() {
@@ -257,16 +249,16 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
   }
 
   void DisableGestureDebounce() {
-    gesture_event_queue()->set_debounce_enabled_for_testing(false);
+    gesture_event_queue().set_debounce_enabled_for_testing(false);
   }
 
   void set_debounce_interval_time_ms(int delay_ms) {
-    gesture_event_queue()->
+    gesture_event_queue().
         set_debounce_interval_time_ms_for_testing(delay_ms);
   }
 
   bool TouchEventQueueEmpty() const {
-    return touch_event_queue()->empty();
+    return touch_event_queue().empty();
   }
 
   bool ScrollStateIsContentScrolling() const {
@@ -315,16 +307,16 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
     unresponsive_timer_fired_ = true;
   }
 
-  const TouchEventQueue* touch_event_queue() const {
-    return input_router_impl_->touch_event_queue_.get();
+  const TouchEventQueue& touch_event_queue() const {
+    return input_router_impl_->touch_event_queue_;
   }
 
-  const GestureEventQueue* gesture_event_queue() const {
-    return input_router_impl_->gesture_event_queue_.get();
+  const GestureEventQueue& gesture_event_queue() const {
+    return input_router_impl_->gesture_event_queue_;
   }
 
-  GestureEventQueue* gesture_event_queue() {
-    return input_router_impl_->gesture_event_queue_.get();
+  GestureEventQueue& gesture_event_queue() {
+    return input_router_impl_->gesture_event_queue_;
   }
 
  private: