Adopt ui::GestureConfiguration on Android

ui/events/events.gyp

Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index c4a0d3f7f9a3489650b37fbf7630a212caa6a72c..0d5bd0e15e7527fdbf5b42e9d3c61b43ac1bce81 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -52,8 +52,6 @@
         'gesture_event_details.h',
         'gestures/fling_curve.cc',
         'gestures/fling_curve.h',
-        'gestures/gesture_configuration.cc',
-        'gestures/gesture_configuration.h',
         'input_device.cc',
         'input_device.h',
         'keyboard_device.cc',
@@ -208,9 +206,10 @@
         'gesture_detection/bitset_32.h',
         'gesture_detection/filtered_gesture_provider.cc',
         'gesture_detection/filtered_gesture_provider.h',
-        'gesture_detection/gesture_config_helper.h',
-        'gesture_detection/gesture_config_helper_android.cc',
-        'gesture_detection/gesture_config_helper_aura.cc',
+        'gesture_detection/gesture_configuration.cc',
+        'gesture_detection/gesture_configuration.h',
+        'gesture_detection/gesture_configuration_android.cc',
+        'gesture_detection/gesture_configuration_aura.cc',
         'gesture_detection/gesture_detection_export.h',
         'gesture_detection/gesture_detector.cc',
         'gesture_detection/gesture_detector.h',
@@ -222,6 +221,8 @@
         'gesture_detection/gesture_listeners.h',
         'gesture_detection/gesture_provider.cc',
         'gesture_detection/gesture_provider.h',
+        "gesture_detection/gesture_provider_config_helper.cc",
+        "gesture_detection/gesture_provider_config_helper.h",
         'gesture_detection/gesture_touch_uma_histogram.cc',
         'gesture_detection/gesture_touch_uma_histogram.h',
         'gesture_detection/motion_event.cc',
@@ -246,7 +247,7 @@
       'conditions': [
         ['use_aura!=1 and OS!="android"', {
           'sources': [
-            'gesture_detection/gesture_config_helper.cc',
+            'gesture_detection/gesture_configuration_default.cc',
           ],
         }],
       ],