Delete joystick scroll/zoom support.

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

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
index d5fbd4d26f5350c7f20b15d1f815281dfe75fc52..2a1321e4ce3cf00a851379ecdd756881a89a4011 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
@@ -7,7 +7,6 @@ package org.chromium.content.browser;
 import android.content.res.Configuration;
 import android.os.SystemClock;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
@@ -132,23 +131,6 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
         });
     }
 
-    private void scrollWithJoystick(final float deltaAxisX, final float deltaAxisY)
-            throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                // Synthesize joystick motion event and send to ContentViewCore.
-                MotionEvent leftJoystickMotionEvent =
-                        MotionEvent.obtain(0, SystemClock.uptimeMillis(), MotionEvent.ACTION_MOVE,
-                                deltaAxisX, deltaAxisY, 0);
-                leftJoystickMotionEvent.setSource(
-                        leftJoystickMotionEvent.getSource() | InputDevice.SOURCE_CLASS_JOYSTICK);
-                getContentViewCore().getContainerView().onGenericMotionEvent(
-                        leftJoystickMotionEvent);
-            }
-        });
-    }
-
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -247,34 +229,6 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
         assertWaitForScroll(false, false);
     }
 
-    @SmallTest
-    @Feature({"Main"})
-    public void testJoystickScroll() throws Throwable {
-        scrollTo(0, 0);
-        assertWaitForScroll(true, true);
-
-        // Scroll with X axis in deadzone and the Y axis active.
-        // Only the Y axis should have an effect, arriving at lower-left.
-        scrollWithJoystick(0.1f, 1f);
-        assertWaitForScroll(true, false);
-
-        // Scroll with Y axis in deadzone and the X axis active.
-        scrollWithJoystick(1f, -0.1f);
-        assertWaitForScroll(false, false);
-
-        // Vertical scroll to upper-right.
-        scrollWithJoystick(0, -0.75f);
-        assertWaitForScroll(false, true);
-
-        // Horizontal scroll to top-left.
-        scrollWithJoystick(-0.75f, 0);
-        assertWaitForScroll(true, true);
-
-        // Diagonal scroll to bottom-right.
-        scrollWithJoystick(1f, 1f);
-        assertWaitForScroll(false, false);
-    }
-
     /**
      * To ensure the device properly responds to bounds-exceeding scrolls, e.g., overscroll
      * effects are properly initialized.