Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / android_webview / javatests / src / org / chromium / android_webview / test / AndroidScrollIntegrationTest.java

diff --git a/src/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/src/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
index 0634f59..9c05181 100644 (file)
--- a/src/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
+++ b/src/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
@@ -13,8 +13,8 @@ import org.chromium.android_webview.test.util.AwTestTouchUtils;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.JavascriptEventObserver;
 import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
+import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
 import java.util.concurrent.Callable;
@@ -669,7 +669,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
         }
     }
 
-    private static class TestGestureStateListener implements ContentViewCore.GestureStateListener {
+    private static class TestGestureStateListener extends GestureStateListener {
         private CallbackHelper mOnScrollUpdateGestureConsumedHelper = new CallbackHelper();
 
         public CallbackHelper getOnScrollUpdateGestureConsumedHelper() {
@@ -677,15 +677,16 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
         }
 
         @Override
-        public void onPinchGestureStart() {
+        public void onPinchStarted() {
         }
 
         @Override
-        public void onPinchGestureEnd() {
+        public void onPinchEnded() {
         }
 
         @Override
-        public void onFlingStartGesture(int velocityX, int velocityY) {
+        public void onFlingStartGesture(
+                int velocityX, int velocityY, int scrollOffsetY, int scrollExtentY) {
         }
 
         @Override
@@ -693,7 +694,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
         }
 
         @Override
-        public void onUnhandledFlingStartEvent() {
+        public void onUnhandledFlingStartEvent(int velocityX, int velocityY) {
         }
 
         @Override
@@ -726,7 +727,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                testContainerView.getContentViewCore().setGestureStateListener(
+                testContainerView.getContentViewCore().addGestureStateListener(
                         testGestureStateListener);
             }
         });