Adopt ui::GestureConfiguration on Android

ui/aura/test/aura_test_base.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/test/aura_test_base.h"
 
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/events/event_dispatcher.h"
 #include "ui/events/event_processor.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace aura {
 namespace test {
 
 AuraTestBase::AuraTestBase()
     : setup_called_(false),
       teardown_called_(false) {
 }
 
 AuraTestBase::~AuraTestBase() {
   CHECK(setup_called_)
       << "You have overridden SetUp but never called super class's SetUp";
   CHECK(teardown_called_)
       << "You have overridden TearDown but never called super class's TearDown";
 }
 
 void AuraTestBase::SetUp() {
   setup_called_ = true;
   testing::Test::SetUp();
   ui::InitializeInputMethodForTesting();
 
   // Changing the parameters for gesture recognition shouldn't cause
   // tests to fail, so we use a separate set of parameters for unit
   // testing.
-  ui::GestureConfiguration::set_long_press_time_in_seconds(1.0);
-  ui::GestureConfiguration::set_semi_long_press_time_in_seconds(0.4);
-  ui::GestureConfiguration::set_show_press_delay_in_ms(5);
-  ui::GestureConfiguration::set_max_distance_for_two_finger_tap_in_pixels(300);
-  ui::GestureConfiguration::set_max_seconds_between_double_click(0.7);
-  ui::GestureConfiguration::
-      set_max_separation_for_gesture_touches_in_pixels(150);
-  ui::GestureConfiguration::
-      set_max_touch_down_duration_in_seconds_for_click(0.8);
-  ui::GestureConfiguration::set_max_touch_move_in_pixels_for_click(5);
-  ui::GestureConfiguration::set_max_distance_between_taps_for_double_tap(20);
-  ui::GestureConfiguration::set_min_distance_for_pinch_scroll_in_pixels(20);
-  ui::GestureConfiguration::set_min_pinch_update_distance_in_pixels(5);
-  ui::GestureConfiguration::set_default_radius(0);
-  ui::GestureConfiguration::set_fling_velocity_cap(15000.0f);
-  ui::GestureConfiguration::set_min_swipe_speed(10);
+  ui::GestureConfiguration::GetInstance()->set_long_press_timeout_in_ms(1000);
+  ui::GestureConfiguration::GetInstance()->set_semi_long_press_time_in_seconds(
+      0.4);
+  ui::GestureConfiguration::GetInstance()->set_show_press_delay_in_ms(5);
+  ui::GestureConfiguration::GetInstance()
+      ->set_max_distance_for_two_finger_tap_in_pixels(300);
+  ui::GestureConfiguration::GetInstance()->set_max_seconds_between_double_click(
+      0.7);
+  ui::GestureConfiguration::GetInstance()
+      ->set_max_separation_for_gesture_touches_in_pixels(150);
+  ui::GestureConfiguration::GetInstance()
+      ->set_max_touch_down_duration_in_seconds_for_click(0.8);
+  ui::GestureConfiguration::GetInstance()
+      ->set_max_touch_move_in_pixels_for_click(5);
+  ui::GestureConfiguration::GetInstance()
+      ->set_max_distance_between_taps_for_double_tap(20);
+  ui::GestureConfiguration::GetInstance()
+      ->set_min_distance_for_pinch_scroll_in_pixels(20);
+  ui::GestureConfiguration::GetInstance()
+      ->set_min_pinch_update_distance_in_pixels(5);
+  ui::GestureConfiguration::GetInstance()->set_default_radius(0);
+  ui::GestureConfiguration::GetInstance()->set_fling_velocity_cap(15000.0f);
+  ui::GestureConfiguration::GetInstance()->set_min_swipe_speed(10);
 
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   helper_.reset(new AuraTestHelper(&message_loop_));
   helper_->SetUp(context_factory);
 }
 
@@ skipping 33 matching lines @@
 
 bool AuraTestBase::DispatchEventUsingWindowDispatcher(ui::Event* event) {
   ui::EventDispatchDetails details =
       event_processor()->OnEventFromSource(event);
   CHECK(!details.dispatcher_destroyed);
   return event->handled();
 }
 
 }  // namespace test
 }  // namespace aura