android: Remove unused GetScrollFriction

BUG=625089

Review-Url: https://codereview.chromium.org/2349043002
Cr-Commit-Position: refs/heads/master@{#419347}

ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java

@@ -82,11 +82,6 @@ public class ViewConfigurationHelper {
         return ViewConfiguration.getTapTimeout();
     }
 
-    @CalledByNative
-    private static float getScrollFriction() {
-        return ViewConfiguration.getScrollFriction();
-    }
-
     @CalledByNative
     private float getMaximumFlingVelocity() {
         return toDips(mViewConfiguration.getScaledMaximumFlingVelocity());

ui/gfx/android/view_configuration.cc

@@ -24,7 +24,6 @@ struct ViewConfigurationData {
       : double_tap_timeout_in_ms_(0),
         long_press_timeout_in_ms_(0),
         tap_timeout_in_ms_(0),
-        scroll_friction_(1.f),
         max_fling_velocity_in_dips_s_(0),
         min_fling_velocity_in_dips_s_(0),
         touch_slop_in_dips_(0),
@@ -40,7 +39,6 @@ struct ViewConfigurationData {
     long_press_timeout_in_ms_ =
         Java_ViewConfigurationHelper_getLongPressTimeout(env);
     tap_timeout_in_ms_ = Java_ViewConfigurationHelper_getTapTimeout(env);
-    scroll_friction_ = Java_ViewConfigurationHelper_getScrollFriction(env);
 
     jobject obj = j_view_configuration_helper_.obj();
     Update(Java_ViewConfigurationHelper_getMaximumFlingVelocity(env, obj),
@@ -65,7 +63,6 @@ struct ViewConfigurationData {
   int double_tap_timeout_in_ms() const { return double_tap_timeout_in_ms_; }
   int long_press_timeout_in_ms() const { return long_press_timeout_in_ms_; }
   int tap_timeout_in_ms() const { return tap_timeout_in_ms_; }
-  float scroll_friction() const { return scroll_friction_; }
 
   int max_fling_velocity_in_dips_s() {
     base::AutoLock autolock(lock_);
@@ -114,7 +111,6 @@ struct ViewConfigurationData {
   int double_tap_timeout_in_ms_;
   int long_press_timeout_in_ms_;
   int tap_timeout_in_ms_;
-  float scroll_friction_;
 
   // These values may vary as view-specific parameters change, so read/write
   // access must be synchronized.
@@ -158,10 +154,6 @@ int ViewConfiguration::GetTapTimeoutInMs() {
   return g_view_configuration.Get().tap_timeout_in_ms();
 }
 
-float ViewConfiguration::GetScrollFriction() {
-  return g_view_configuration.Get().scroll_friction();
-}
-
 int ViewConfiguration::GetMaximumFlingVelocityInDipsPerSecond() {
   return g_view_configuration.Get().max_fling_velocity_in_dips_s();
 }

ui/gfx/android/view_configuration.h

@@ -19,9 +19,6 @@ class GFX_EXPORT ViewConfiguration {
   static int GetLongPressTimeoutInMs();
   static int GetTapTimeoutInMs();
 
-  // Dimensionless coefficient of friction.
-  static float GetScrollFriction();
-
   static int GetMaximumFlingVelocityInDipsPerSecond();
   static int GetMinimumFlingVelocityInDipsPerSecond();
 
@@ -29,7 +26,6 @@ class GFX_EXPORT ViewConfiguration {
   static int GetDoubleTapSlopInDips();
 
   static int GetMinScalingSpanInDips();
-  static int GetMinScalingTouchMajorInDips();
 
   // Registers methods with JNI and returns true if succeeded.
   static bool RegisterViewConfiguration(JNIEnv* env);