Plumb smooth scrolling in Chromium compositor

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
index b9add33c717ecd97f305c4696876bda4bfce8ef4..6a1d9ac6916b1f5a4968fe5e7141cbb110fd76d1 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
@@ -8,7 +8,6 @@ import android.content.Context;
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
-import android.widget.OverScroller;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwScrollOffsetManager;
@@ -129,8 +128,8 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
         return new TestDependencyFactory() {
             @Override
             public AwScrollOffsetManager createScrollOffsetManager(
-                    AwScrollOffsetManager.Delegate delegate, OverScroller overScroller) {
-                return new AwScrollOffsetManager(delegate, overScroller);
+                    AwScrollOffsetManager.Delegate delegate) {
+                return new AwScrollOffsetManager(delegate);
             }
             @Override
             public AwTestContainerView createAwTestContainerView(AwTestRunnerActivity activity,
@@ -733,10 +732,6 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
         }
 
         @Override
-        public void onFlingCancelGesture() {
-        }
-
-        @Override
         public void onScrollUpdateGestureConsumed() {
             mOnScrollUpdateGestureConsumedHelper.notifyCalled();
         }