Gesture recognition constants should all be stored in the GestureConfiguration object.

ui/aura/gestures/gesture_recognizer_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 "base/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/event.h"
+#include "ui/aura/gestures/gesture_configuration.h"
 #include "ui/aura/gestures/gesture_recognizer_aura.h"
 #include "ui/aura/gestures/gesture_sequence.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
@@ skipping 291 matching lines @@
 void SendScrollEvent(RootWindow* root_window,
                      int x,
                      int y,
                      int touch_id,
                      GestureEventConsumeDelegate* delegate) {
   delegate->Reset();
   TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(x, y), touch_id);
   root_window->DispatchTouchEvent(&move);
 }
 
-const int kBufferedPoints = 10;
-
 }  // namespace
 
 typedef AuraTestBase GestureRecognizerTest;
 
 // Check that appropriate touch events generate tap gesture events.
 TEST_F(GestureRecognizerTest, GestureEventTap) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   const int kWindowWidth = 123;
   const int kWindowHeight = 45;
@@ skipping 116 matching lines @@
   root_window()->DispatchTouchEvent(&press);
 
   // Move the touch-point horizontally enough that it is considered a
   // horizontal scroll.
   SendScrollEvent(root_window(), 20, 1, kTouchId, delegate.get());
   EXPECT_EQ(0, delegate->scroll_y());
   EXPECT_EQ(20, delegate->scroll_x());
 
   // Get a high x velocity, while still staying on the rail
   SendScrollEvents(root_window(), 1, 1, press.time_stamp(),
-                   100, 10, kTouchId, 1, kBufferedPoints, delegate.get());
+                   100, 10, kTouchId, 1,
+                   GestureConfiguration::points_buffered_for_velocity(),
+                   delegate.get());
 
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201), kTouchId);
   root_window()->DispatchTouchEvent(&release);
 
   EXPECT_TRUE(delegate->scroll_end());
   EXPECT_EQ(100000, delegate->velocity_x());
   EXPECT_EQ(0, delegate->velocity_y());
 }
 
@@ skipping 11 matching lines @@
   root_window()->DispatchTouchEvent(&press);
 
   // Move the touch-point vertically enough that it is considered a
   // vertical scroll.
   SendScrollEvent(root_window(), 1, 20, kTouchId, delegate.get());
   EXPECT_EQ(20, delegate->scroll_y());
   EXPECT_EQ(0, delegate->scroll_x());
 
   // Get a high y velocity, while still staying on the rail
   SendScrollEvents(root_window(), 1, 1, press.time_stamp(),
-                   10, 100, kTouchId, 1, kBufferedPoints, delegate.get());
+                   10, 100, kTouchId, 1,
+                   GestureConfiguration::points_buffered_for_velocity(),
+                   delegate.get());
 
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201), kTouchId);
   root_window()->DispatchTouchEvent(&release);
 
   EXPECT_TRUE(delegate->scroll_end());
   EXPECT_EQ(0, delegate->velocity_x());
   EXPECT_EQ(100000, delegate->velocity_y());
 }
 
 // Check Scroll End Events report correct velocities
 // if the user is not on a rail
 TEST_F(GestureRecognizerTest, GestureEventNonRailFling) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   const int kTouchId = 7;
   gfx::Rect bounds(0, 0, 1000, 1000);
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       delegate.get(), -1234, bounds, NULL));
 
   TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), kTouchId);
   root_window()->DispatchTouchEvent(&press);
 
   // Move the touch-point such that a non-rail scroll begins
   SendScrollEvent(root_window(), 20, 20, kTouchId, delegate.get());
   EXPECT_EQ(20, delegate->scroll_y());
   EXPECT_EQ(20, delegate->scroll_x());
 
   SendScrollEvents(root_window(), 1, 1, press.time_stamp(),
-                   10, 100, kTouchId, 1, kBufferedPoints, delegate.get());
+                   10, 100, kTouchId, 1,
+                   GestureConfiguration::points_buffered_for_velocity(),
+                   delegate.get());
 
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201), kTouchId);
   root_window()->DispatchTouchEvent(&release);
 
   EXPECT_TRUE(delegate->scroll_end());
   EXPECT_EQ(10000, delegate->velocity_x());
   EXPECT_EQ(100000, delegate->velocity_y());
 }
 
@@ skipping 144 matching lines @@
 
   SendScrollEvent(root_window(), 25, 6, kTouchId, delegate.get());
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_EQ(5, delegate->scroll_x());
   // y shouldn't change, as we're on a horizontal rail.
   EXPECT_EQ(0, delegate->scroll_y());
 
   // Send enough information that a velocity can be calculated for the gesture,
   // and we can break the rail
   SendScrollEvents(root_window(), 1, 1, press.time_stamp(),
-                   1, 100, kTouchId, 1, kBufferedPoints, delegate.get());
+                   1, 100, kTouchId, 1,
+                   GestureConfiguration::points_buffered_for_velocity(),
+                   delegate.get());
 
   SendScrollEvent(root_window(), 0, 0, kTouchId, delegate.get());
   SendScrollEvent(root_window(), 5, 5, kTouchId, delegate.get());
 
   // The rail should be broken
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_EQ(5, delegate->scroll_x());
   EXPECT_EQ(5, delegate->scroll_y());
 }
 
@@ skipping 18 matching lines @@
 
   SendScrollEvent(root_window(), 6, 25, kTouchId, delegate.get());
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_EQ(5, delegate->scroll_y());
   // x shouldn't change, as we're on a vertical rail.
   EXPECT_EQ(0, delegate->scroll_x());
 
   // Send enough information that a velocity can be calculated for the gesture,
   // and we can break the rail
   SendScrollEvents(root_window(), 1, 1, press.time_stamp(),
-                   100, 1, kTouchId, 1, kBufferedPoints, delegate.get());
+                   100, 1, kTouchId, 1,
+                   GestureConfiguration::points_buffered_for_velocity(),
+                   delegate.get());
 
   SendScrollEvent(root_window(), 0, 0, kTouchId, delegate.get());
   SendScrollEvent(root_window(), 5, 5, kTouchId, delegate.get());
 
   // The rail should be broken
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_EQ(5, delegate->scroll_x());
   EXPECT_EQ(5, delegate->scroll_y());
 }
 
@@ skipping 506 matching lines @@
   delegate->Reset();
   TouchEvent press1(ui::ET_TOUCH_PRESSED, gfx::Point(100, 100), kTouchId1);
 
   root_window()->DispatchTouchEvent(&press1);
 
   delegate->Reset();
   TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(110, 110), kTouchId2);
   root_window()->DispatchTouchEvent(&press2);
 
   SendScrollEvents(root_window(), 100, 100, press1.time_stamp(),
-                   1, 10, kTouchId1, 1, kBufferedPoints, delegate.get());
+                   1, 10, kTouchId1, 1,
+                   GestureConfiguration::points_buffered_for_velocity(),
+                   delegate.get());
 
   SendScrollEvents(root_window(), 110, 110, press1.time_stamp() +
                    base::TimeDelta::FromMilliseconds(1000),
-                   1, 10, kTouchId2, 1, kBufferedPoints, delegate.get());
+                   1, 10, kTouchId2, 1,
+                   GestureConfiguration::points_buffered_for_velocity(),
+                   delegate.get());
   // At no point were both fingers moving at the same time,
   // so no scrolling should have occurred
 
   EXPECT_EQ(0, delegate->scroll_x());
   EXPECT_EQ(0, delegate->scroll_y());
 }
 
 TEST_F(GestureRecognizerTest, GestureEventIgnoresDisconnectedEvents) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
 
   TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201), 6);
   root_window()->DispatchTouchEvent(&release1);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
 }
 
 }  // namespace test
 }  // namespace aura