Add support for ordinal scroll amounts

ui/aura/root_window_unittest.cc

 // Copyright (c) 2012 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 "ui/aura/root_window.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/event_client.h"
@@ skipping 362 matching lines @@
 TEST_F(RootWindowTest, ScrollEventDispatch) {
   base::TimeDelta now = ui::EventTimeForNow();
   test::TestEventHandler* filter = new test::TestEventHandler;
   root_window()->SetEventFilter(filter);
 
   test::TestWindowDelegate delegate;
   scoped_ptr<Window> w1(CreateWindow(1, root_window(), &delegate));
   w1->SetBounds(gfx::Rect(20, 20, 40, 40));
 
   // A scroll event on the root-window itself is dispatched.
-  ui::ScrollEvent scroll1(ui::ET_SCROLL, gfx::Point(10, 10), now, 0, 0, -10, 2);
+  ui::ScrollEvent scroll1(ui::ET_SCROLL,
+                          gfx::Point(10, 10),
+                          now,
+                          0,
+                          0, -10,
+                          0, -10,
+                          2);
   root_window()->AsRootWindowHostDelegate()->OnHostScrollEvent(&scroll1);
   EXPECT_EQ(1, filter->num_scroll_events());
 
   // Scroll event on a window should be dispatched properly.
-  ui::ScrollEvent scroll2(ui::ET_SCROLL, gfx::Point(25, 30), now, 0, -10, 0, 2);
+  ui::ScrollEvent scroll2(ui::ET_SCROLL,
+                          gfx::Point(25, 30),
+                          now,
+                          0,
+                          -10, 0,
+                          -10, 0,
+                          2);
   root_window()->AsRootWindowHostDelegate()->OnHostScrollEvent(&scroll2);
   EXPECT_EQ(2, filter->num_scroll_events());
 }
 
 namespace {
 
 // FilterFilter that tracks the types of events it's seen.
 class EventFilterRecorder : public ui::EventHandler {
  public:
   typedef std::vector<ui::EventType> Events;
@@ skipping 385 matching lines @@
   // Tap on w2 which triggers nested gestures for w1.
   test::EventGenerator generator(root_window(), w2.get());
   generator.GestureTapAt(w2->bounds().CenterPoint());
 
   // Both windows should get their gesture end events.
   EXPECT_EQ(1, d1.gesture_end_count());
   EXPECT_EQ(1, d2.gesture_end_count());
 }
 
 }  // namespace aura