Unify Android Webview and Chrome's fling

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

 // Copyright 2013 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.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
@@ skipping 112 matching lines @@
         }
         super.tearDown();
     }
 
     @Override
     protected TestDependencyFactory createTestDependencyFactory() {
         return new TestDependencyFactory() {
             @Override
             public AwScrollOffsetManager createScrollOffsetManager(
                     AwScrollOffsetManager.Delegate delegate, OverScroller overScroller) {
-                return new AwScrollOffsetManager(delegate, overScroller) {
-                    @Override
-                    public void onUnhandledFlingStartEvent(int velocityX, int velocityY) {
-                        // Intentional no-op. The synthetic scroll gestures this test creates all
-                        // happen at the same time which triggers the fling detection logic.
-                        // NOTE: this simply disables handling the gesture, flinging the AwContents
-                        // via the flingScroll API is still possible.
-                    }
-                };
+                return new AwScrollOffsetManager(delegate, overScroller);
             }
             @Override
             public AwTestContainerView createAwTestContainerView(AwTestRunnerActivity activity,
                     boolean allowHardwareAcceleration) {
                 return new ScrollTestContainerView(activity, allowHardwareAcceleration);
             }
         };
     }
 
     private static final String TEST_PAGE_COMMON_HEADERS =
@@ skipping 586 matching lines @@
         @Override
         public void onFlingStartGesture(
                 int velocityX, int velocityY, int scrollOffsetY, int scrollExtentY) {
         }
 
         @Override
         public void onFlingCancelGesture() {
         }
 
         @Override
-        public void onUnhandledFlingStartEvent(int velocityX, int velocityY) {
-        }
-
-        @Override
         public void onScrollUpdateGestureConsumed() {
             mOnScrollUpdateGestureConsumedHelper.notifyCalled();
         }
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testTouchScrollingConsumesScrollByGesture() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
@@ skipping 70 matching lines @@
                 assertTrue(String.format(Locale.ENGLISH,
                         "Scroll range should increase after zoom (%d) > (%d)",
                         newScrollRange, oldScrollRange), newScrollRange > oldScrollRange);
                 assertEquals(awContents.getContentHeightCss(), oldContentHeightApproximation);
                 assertEquals(awContents.getContentHeightCss(), newContentHeightApproximation);
             }
         });
 
     }
 }