Add support for ordinal scroll amounts

ui/aura/test/event_generator.cc

Index: ui/aura/test/event_generator.cc
diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc
index fe05133e8636943ff7a9835f59ec1e7b6ccc0ac8..82735fc36509bc93155564180fccfb3130ced3ce 100644
--- a/ui/aura/test/event_generator.cc
+++ b/ui/aura/test/event_generator.cc
@@ -312,8 +312,8 @@ void EventGenerator::ScrollSequence(const gfx::Point& start,
                                start,
                                timestamp,
                                0,
-                               0,
-                               0,
+                               0, 0,
+                               0, 0,
                                num_fingers);
   Dispatch(&fling_cancel);
 
@@ -325,8 +325,8 @@ void EventGenerator::ScrollSequence(const gfx::Point& start,
                          start,
                          timestamp,
                          0,
-                         dx,
-                         dy,
+                         dx, dy,
+                         dx, dy,
                          num_fingers);
     Dispatch(&move);
   }
@@ -335,8 +335,8 @@ void EventGenerator::ScrollSequence(const gfx::Point& start,
                               start,
                               timestamp,
                               0,
-                              x_offset,
-                              y_offset,
+                              x_offset, y_offset,
+                              x_offset, y_offset,
                               num_fingers);
   Dispatch(&fling_start);
 }
@@ -351,8 +351,8 @@ void EventGenerator::ScrollSequence(const gfx::Point& start,
                                start,
                                timestamp,
                                0,
-                               0,
-                               0,
+                               0, 0,
+                               0, 0,
                                num_fingers);
   Dispatch(&fling_cancel);
 
@@ -362,8 +362,8 @@ void EventGenerator::ScrollSequence(const gfx::Point& start,
                            start,
                            timestamp,
                            0,
-                           offsets[i].x(),
-                           offsets[i].y(),
+                           offsets[i].x(), offsets[i].y(),
+                           offsets[i].x(), offsets[i].y(),
                            num_fingers);
     Dispatch(&scroll);
   }
@@ -372,8 +372,8 @@ void EventGenerator::ScrollSequence(const gfx::Point& start,
                               start,
                               timestamp,
                               0,
-                              offsets[steps - 1].x(),
-                              offsets[steps - 1].y(),
+                              offsets[steps - 1].x(), offsets[steps - 1].y(),
+                              offsets[steps - 1].x(), offsets[steps - 1].y(),
                               num_fingers);
   Dispatch(&fling_start);
 }