Adopt ui::GestureConfiguration on Android

ui/aura/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/window.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 18 matching lines @@
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/compositor/test/test_layers.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vector2d.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(const char*)
 DECLARE_WINDOW_PROPERTY_TYPE(int)
 
 namespace aura {
 namespace test {
 
 class WindowTest : public AuraTestBase {
  public:
   WindowTest() : max_separation_(0) {
   }
 
   virtual void SetUp() override {
     AuraTestBase::SetUp();
     // TODO: there needs to be an easier way to do this.
-    max_separation_ = ui::GestureConfiguration::
-        max_separation_for_gesture_touches_in_pixels();
-    ui::GestureConfiguration::
-        set_max_separation_for_gesture_touches_in_pixels(0);
+    max_separation_ = ui::GestureConfiguration::GetInstance()
+                          ->max_separation_for_gesture_touches_in_pixels();
+    ui::GestureConfiguration::GetInstance()
+        ->set_max_separation_for_gesture_touches_in_pixels(0);
   }
 
   virtual void TearDown() override {
     AuraTestBase::TearDown();
-    ui::GestureConfiguration::
-        set_max_separation_for_gesture_touches_in_pixels(max_separation_);
+    ui::GestureConfiguration::GetInstance()
+        ->set_max_separation_for_gesture_touches_in_pixels(max_separation_);
   }
 
  private:
   float max_separation_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTest);
 };
 
 namespace {
 
@@ skipping 3409 matching lines @@
 
   EXPECT_TRUE(animator.get());
   EXPECT_FALSE(animator->is_animating());
   EXPECT_TRUE(observer.animation_completed());
   EXPECT_FALSE(observer.animation_aborted());
   animator->RemoveObserver(&observer);
 }
 
 }  // namespace test
 }  // namespace aura