Delete Android joystick zoom code.

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 b92f82ecaa332fd47abb3ceac6765e48c1b1024e..a473ac5ae4d344ee98ca36ead58328dff44b4e07 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
@@ -47,7 +47,6 @@ import org.chromium.content.browser.accessibility.captioning.SystemCaptioningBri
 import org.chromium.content.browser.accessibility.captioning.TextTrackSettings;
 import org.chromium.content.browser.input.ImeAdapter;
 import org.chromium.content.browser.input.InputMethodManagerWrapper;
-import org.chromium.content.browser.input.JoystickZoomProvider;
 import org.chromium.content.browser.input.SelectPopup;
 import org.chromium.content.browser.input.SelectPopupDialog;
 import org.chromium.content.browser.input.SelectPopupDropdown;
@@ -84,10 +83,9 @@ import java.util.Map;
  * See https://crbug.com/598880.
  */
 @JNINamespace("content")
-public class ContentViewCore
-        implements AccessibilityStateChangeListener, DisplayAndroidObserver,
-                   SystemCaptioningBridge.SystemCaptioningBridgeListener, WindowAndroidProvider,
-                   JoystickZoomProvider.PinchZoomHandler, ImeEventObserver {
+public class ContentViewCore implements AccessibilityStateChangeListener, DisplayAndroidObserver,
+                                        SystemCaptioningBridge.SystemCaptioningBridgeListener,
+                                        WindowAndroidProvider, ImeEventObserver {
     private static final String TAG = "cr_ContentViewCore";
 
     // Used to avoid enabling zooming in / out if resulting zooming will
@@ -236,10 +234,6 @@ public class ContentViewCore
     // Whether joystick scroll is enabled.  It's disabled when an editable field is focused.
     private boolean mJoystickScrollEnabled = true;
 
-    // Provides smooth gamepad joystick-driven zooming. Created lazily when the first
-    // Joystick event was received.
-    private JoystickZoomProvider mJoystickZoomProvider;
-
     private boolean mIsMobileOptimizedHint;
 
     private SelectionPopupController mSelectionPopupController;
@@ -568,9 +562,6 @@ public class ContentViewCore
             if (mSelectionPopupController != null) {
                 mSelectionPopupController.setContainerView(containerView);
             }
-            if (mJoystickZoomProvider != null) {
-                mJoystickZoomProvider.setContainerView(containerView);
-            }
         } finally {
             TraceEvent.end("ContentViewCore.setContainerView");
         }
@@ -1315,20 +1306,10 @@ public class ContentViewCore
                 flingViewport(event.getEventTime(), -velocityX, -velocityY, true);
                 return true;
             }
-            if (getJoystickZoomProvider().onMotion(event)) return true;
         }
         return mContainerViewInternals.super_onGenericMotionEvent(event);
     }
 
-    private JoystickZoomProvider getJoystickZoomProvider() {
-        if (mJoystickZoomProvider == null) {
-            mJoystickZoomProvider = new JoystickZoomProvider(getContainerView(),
-                    mRenderCoordinates.getDeviceScaleFactor(), getViewportWidthPix() / 2,
-                    getViewportHeightPix() / 2, this);
-        }
-        return mJoystickZoomProvider;
-    }
-
     /**
      * Sets the current amount to offset incoming touch events by (including MotionEvent and
      * DragEvent). This is used to handle content moving and not lining up properly with the
@@ -1802,7 +1783,7 @@ public class ContentViewCore
      * @param delta the factor by which the current page scale should be multiplied by.
      * @return whether the gesture was sent.
      */
-    public boolean pinchByDelta(float delta) {
+    private boolean pinchByDelta(float delta) {
         if (mNativeContentViewCore == 0) return false;
 
         long timeMs = SystemClock.uptimeMillis();
@@ -1816,27 +1797,6 @@ public class ContentViewCore
         return true;
     }
 
-    @Override
-    public boolean pinchBegin(int xPix, int yPix) {
-        if (mNativeContentViewCore == 0) return false;
-        nativePinchBegin(mNativeContentViewCore, SystemClock.uptimeMillis(), xPix, yPix);
-        return true;
-    }
-
-    @Override
-    public boolean pinchBy(int xPix, int yPix, float delta) {
-        if (mNativeContentViewCore == 0) return false;
-        nativePinchBy(mNativeContentViewCore, SystemClock.uptimeMillis(), xPix, yPix, delta);
-        return true;
-    }
-
-    @Override
-    public boolean pinchEnd() {
-        if (mNativeContentViewCore == 0) return false;
-        nativePinchEnd(mNativeContentViewCore, SystemClock.uptimeMillis());
-        return true;
-    }
-
     /**
      * Enables or disables inspection of JavaScript objects added via
      * {@link #addJavascriptInterface(Object, String)} by means of Object.keys() method and