Make it possible for the scroll offset delegate to intercept 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 74891a4a66f3a08abf98a2db5d2f8f9c04a81a85..39ccbe7ee93ffbba164d928e743dc32dcf96b0eb 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
@@ -4,8 +4,10 @@
 
 package org.chromium.android_webview.test;
 
+import android.content.Context;
 import android.view.View;
 import android.view.View.MeasureSpec;
+import android.widget.OverScroller;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -21,6 +23,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
         private int mScrollY;
         private int mNativeScrollX;
         private int mNativeScrollY;
+        private int mInvalidateCount;
 
         public int getOverScrollDeltaX() {
             return mOverScrollDeltaX;
@@ -50,6 +53,10 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
             return mNativeScrollY;
         }
 
+        public int getInvalidateCount() {
+            return mInvalidateCount;
+        }
+
         @Override
         public void overScrollContainerViewBy(int deltaX, int deltaY, int scrollX, int scrollY,
                 int scrollRangeX, int scrollRangeY, boolean isTouchEvent) {
@@ -79,6 +86,17 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
         public int getContainerViewScrollY() {
             return mScrollY;
         }
+
+        @Override
+        public void invalidate() {
+            mInvalidateCount += 1;
+        }
+    }
+
+    private static class TestOverScroller extends OverScroller {
+        public TestOverScroller(Context context) {
+            super(context);
+        }
     }
 
     private void simulateScrolling(AwScrollOffsetManager offsetManager,
@@ -98,7 +116,8 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
     @Feature({"AndroidWebView"})
     public void testWhenContentSizeMatchesView() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);
+        TestOverScroller scroller = new TestOverScroller(getInstrumentation().getContext());
+        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int width = 132;
         final int height = 212;
@@ -150,7 +169,8 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
     @Feature({"AndroidWebView"})
     public void testScrollRangeAndMaxOffset() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);
+        TestOverScroller scroller = new TestOverScroller(getInstrumentation().getContext());
+        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
@@ -207,7 +227,8 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
                 return overrideScrollY;
             }
         };
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);
+        TestOverScroller scroller = new TestOverScroller(getInstrumentation().getContext());
+        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
@@ -233,7 +254,8 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
                 return overrideScrollY;
             }
         };
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);
+        TestOverScroller scroller = new TestOverScroller(getInstrumentation().getContext());
+        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
@@ -247,7 +269,8 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
     @Feature({"AndroidWebView"})
     public void testScrollContainerViewTo() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);
+        TestOverScroller scroller = new TestOverScroller(getInstrumentation().getContext());
+        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int scrollX = 31;
         final int scrollY = 41;
@@ -269,7 +292,8 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
     @Feature({"AndroidWebView"})
     public void testOnContainerViewOverScrolled() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);
+        TestOverScroller scroller = new TestOverScroller(getInstrumentation().getContext());
+        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int scrollX = 31;
         final int scrollY = 41;
@@ -293,7 +317,8 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
     @Feature({"AndroidWebView"})
     public void testDefersScrollUntilTouchEnd() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);
+        TestOverScroller scroller = new TestOverScroller(getInstrumentation().getContext());
+        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int scrollX = 31;
         final int scrollY = 41;