Unify Android Webview and Chrome's fling

android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
index 4cf7e1ff3d26025895538969ef04e5a1c11585fc..525c4f6e89460de24f44223ce3a8bd1125b6070f 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
@@ -95,6 +95,10 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
         public void invalidate() {
             mInvalidateCount += 1;
         }
+
+        @Override
+        public void cancelFling() {
+        }
     }
 
     private void simulateScrolling(AwScrollOffsetManager offsetManager,
@@ -349,24 +353,6 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"AndroidWebView"})
-    public void testFlingScroll() {
-        TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
-        OverScroller scroller = new OverScroller(getInstrumentation().getContext());
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
-
-        offsetManager.flingScroll(0, 101);
-        assertTrue(!scroller.isFinished());
-        assertTrue(delegate.getInvalidateCount() == 1);
-        assertEquals(101, (int) scroller.getCurrVelocity());
-
-        offsetManager.flingScroll(111, 0);
-        assertTrue(!scroller.isFinished());
-        assertTrue(delegate.getInvalidateCount() == 2);
-        assertEquals(111, (int) scroller.getCurrVelocity());
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView"})
     public void testRequestChildRectangleOnScreenDontScrollIfAlreadyThere() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());