Adopt ui::GestureConfiguration on Android

ui/events/gestures/motion_event_aura.cc

 // Copyright 2014 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/gestures/motion_event_aura.h"
 
 #include <cmath>
 
 #include "base/logging.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace ui {
 
 MotionEventAura::MotionEventAura()
     : pointer_count_(0), cached_action_index_(-1) {
 }
 
 MotionEventAura::MotionEventAura(
     size_t pointer_count,
     const base::TimeTicks& last_touch_time,
@@ skipping 39 matching lines @@
     point_data.touch_major = 2.f * radius_x;
     point_data.touch_minor = 2.f * radius_y;
     point_data.orientation = rotation_angle_rad - M_PI_2;
   } else {
     point_data.touch_major = 2.f * radius_y;
     point_data.touch_minor = 2.f * radius_x;
     point_data.orientation = rotation_angle_rad;
   }
 
   if (!point_data.touch_major) {
-    point_data.touch_major = 2.f * GestureConfiguration::default_radius();
-    point_data.touch_minor = 2.f * GestureConfiguration::default_radius();
+    point_data.touch_major =
+        2.f * GestureConfiguration::GetInstance()->default_radius();
+    point_data.touch_minor =
+        2.f * GestureConfiguration::GetInstance()->default_radius();
     point_data.orientation = 0;
   }
 
   return point_data;
 }
 
 void MotionEventAura::OnTouch(const TouchEvent& touch) {
   switch (touch.type()) {
     case ET_TOUCH_PRESSED:
       AddTouch(touch);
@@ skipping 193 matching lines @@
 size_t MotionEventAura::GetIndexFromId(int id) const {
   for (size_t i = 0; i < pointer_count_; ++i) {
     if (active_touches_[i].touch_id == id)
       return i;
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace ui