Keep track of coalesced events in main thread event queue

third_party/WebKit/Source/web/tests/RootScrollerTest.cpp

Index: third_party/WebKit/Source/web/tests/RootScrollerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp b/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp
index 230727d51733a778b4330c06332876ffffbc32b4..a90a6531502c5d815a8aafc1148c7ce52e20ad44 100644
--- a/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/RootScrollerTest.cpp
@@ -124,24 +124,24 @@ class RootScrollerTest : public ::testing::Test {
     return &doc->rootScrollerController().effectiveRootScroller();
   }
 
-  WebGestureEvent generateTouchGestureEvent(WebInputEvent::Type type,
-                                            int deltaX = 0,
-                                            int deltaY = 0) {
+  WebCoalescedInputEvent generateTouchGestureEvent(WebInputEvent::Type type,
+                                                   int deltaX = 0,
+                                                   int deltaY = 0) {
     return generateGestureEvent(type, WebGestureDeviceTouchscreen, deltaX,
                                 deltaY);
   }
 
-  WebGestureEvent generateWheelGestureEvent(WebInputEvent::Type type,
-                                            int deltaX = 0,
-                                            int deltaY = 0) {
+  WebCoalescedInputEvent generateWheelGestureEvent(WebInputEvent::Type type,
+                                                   int deltaX = 0,
+                                                   int deltaY = 0) {
     return generateGestureEvent(type, WebGestureDeviceTouchpad, deltaX, deltaY);
   }
 
  protected:
-  WebGestureEvent generateGestureEvent(WebInputEvent::Type type,
-                                       WebGestureDevice device,
-                                       int deltaX,
-                                       int deltaY) {
+  WebCoalescedInputEvent generateGestureEvent(WebInputEvent::Type type,
+                                              WebGestureDevice device,
+                                              int deltaX,
+                                              int deltaY) {
     WebGestureEvent event(type, WebInputEvent::NoModifiers,
                           WebInputEvent::TimeStampForTesting);
     event.sourceDevice = device;
@@ -151,7 +151,7 @@ class RootScrollerTest : public ::testing::Test {
       event.data.scrollUpdate.deltaX = deltaX;
       event.data.scrollUpdate.deltaY = deltaY;
     }
-    return event;
+    return WebCoalescedInputEvent(event);
   }
 
   WebViewImpl* initializeInternal(const std::string& url,