Forward GenericMotionEvent to EventForwarder

content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java
index d6a824d5d3cc9d97654a1c1a726a1040b6a43167..6f35ecb2c6a5dd8fb72d2ac08b6208f4d2a8a316 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java
@@ -17,9 +17,9 @@ import org.junit.runner.RunWith;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
-import org.chromium.content.browser.input.AnimationIntervalProvider;
-import org.chromium.content.browser.input.JoystickZoomProvider;
 import org.chromium.content_shell_apk.ContentShellActivityTestRule;
+import org.chromium.ui.input.AnimationIntervalProvider;
+import org.chromium.ui.input.JoystickZoomProvider;
 
 /**
  * Tests that ContentView running inside ContentShell can be zoomed using gamepad joystick.
@@ -47,8 +47,9 @@ public class ContentViewZoomingTest {
 
     private class TestJoystickZoomProvider extends JoystickZoomProvider {
         TestJoystickZoomProvider(ContentViewCore cvc, AnimationIntervalProvider intervalProvider) {
-            super(cvc, intervalProvider);
-            mDeviceScaleFactor = 2.0f;
+            super(cvc.getContainerView(), 2.0f, cvc.getViewportWidthPix() / 2,
+                    cvc.getViewportHeightPix() / 2, cvc);
+            setAnimationIntervalProviderForTesting(intervalProvider);
 
             mZoomRunnable = new Runnable() {
                 @Override