[Android] Out with the Android GR, in with the new unified C++ GR

ui/events/gesture_detection/gesture_config_helper_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.
 
 #include "ui/events/gesture_detection/gesture_config_helper.h"
 
 #include "ui/events/gestures/gesture_configuration.h"
 #include "ui/gfx/screen.h"
 
 namespace ui {
@@ skipping 36 matching lines @@
   const gfx::Display& display =
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
 
   config.screen_width_pixels = display.GetSizeInPixel().width();
   config.screen_height_pixels = display.GetSizeInPixel().height();
   config.device_scale_factor = display.device_scale_factor();
 
   return config;
 }
 
-GestureProvider::Config DefaultGestureHandlerConfig() {
+GestureProvider::Config DefaultGestureProviderConfig() {
   GestureProvider::Config config;
   config.gesture_detector_config = DefaultGestureDetectorConfig();
   config.scale_gesture_detector_config = DefaultScaleGestureDetectorConfig();
   config.snap_scroll_controller_config = DefaultSnapScrollControllerConfig();
   return config;
 }
 
 }  // namespace ui