Delete joystick scroll/zoom support.

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 12abff599f8dfa9dd76f52e5b06bc1444838b6bc..71c34559cfe6329107043d30b9a63733eb34c19c 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -65,8 +65,6 @@ import org.chromium.content.browser.input.AnimationIntervalProvider;
 import org.chromium.content.browser.input.FloatingPastePopupMenu;
 import org.chromium.content.browser.input.ImeAdapter;
 import org.chromium.content.browser.input.InputMethodManagerWrapper;
-import org.chromium.content.browser.input.JoystickScrollProvider;
-import org.chromium.content.browser.input.JoystickZoomProvider;
 import org.chromium.content.browser.input.LegacyPastePopupMenu;
 import org.chromium.content.browser.input.PastePopupMenu;
 import org.chromium.content.browser.input.PastePopupMenu.PastePopupMenuDelegate;
@@ -354,12 +352,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
     // Cached copy of all positions and scales as reported by the renderer.
     private final RenderCoordinates mRenderCoordinates;
 
-    // Provides smooth gamepad joystick-driven scrolling.
-    private final JoystickScrollProvider mJoystickScrollProvider;
-
-    // Provides smooth gamepad joystick-driven zooming.
-    private JoystickZoomProvider mJoystickZoomProvider;
-
     private boolean mIsMobileOptimizedHint;
 
     // Tracks whether a selection is currently active.  When applied to selected text, indicates
@@ -479,7 +471,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
     public ContentViewCore(Context context) {
         mContext = context;
         mRenderCoordinates = new RenderCoordinates();
-        mJoystickScrollProvider = new JoystickScrollProvider(this);
         mAccessibilityManager = (AccessibilityManager)
                 getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
         mSystemCaptioningBridge = CaptioningBridgeFactory.getSystemCaptioningBridge(mContext);
@@ -1512,7 +1503,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
 
     public void onFocusChanged(boolean gainFocus) {
         mImeAdapter.onViewFocusChanged(gainFocus);
-        mJoystickScrollProvider.setEnabled(gainFocus && !mFocusedNodeEditable);
 
         if (gainFocus) {
             restoreSelectionPopupsIfNecessary();
@@ -1632,13 +1622,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
                     mContainerView.postDelayed(mFakeMouseMoveRunnable, 250);
                     return true;
             }
-        } else if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
-            if (mJoystickScrollProvider.onMotion(event)) return true;
-            if (mJoystickZoomProvider == null) {
-                mJoystickZoomProvider =
-                        new JoystickZoomProvider(this, new SystemAnimationIntervalProvider());
-            }
-            if (mJoystickZoomProvider.onMotion(event)) return true;
         }
         return mContainerViewInternals.super_onGenericMotionEvent(event);
     }
@@ -2343,7 +2326,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
             mFocusedNodeIsPassword = focusedNodeIsPassword;
             if (focusedNodeEditable != mFocusedNodeEditable) {
                 mFocusedNodeEditable = focusedNodeEditable;
-                mJoystickScrollProvider.setEnabled(!mFocusedNodeEditable);
                 getContentViewClient().onFocusedNodeEditabilityChanged(mFocusedNodeEditable);
             }
         } finally {