Revert of Refactor Chromoting JNI code to use jni/Client (Java changes only).

remoting/android/java/src/org/chromium/chromoting/SimulatedTouchInputStrategy.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting;
 
 import android.content.Context;
 import android.graphics.Point;
 import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
-import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.JniInterface;
 
 /**
  * This class receives local touch events and translates them into the appropriate mouse based
  * events for the remote host.  The net result is that the local input method feels like a touch
  * interface but the remote host will be given mouse events to inject.
  */
 public class SimulatedTouchInputStrategy implements InputStrategyInterface {
     /** Used to adjust the size of the region used for double tap detection. */
     private static final float DOUBLE_TAP_SLOP_SCALE_FACTOR = 0.25f;
 
     private final RenderData mRenderData;
-    private final Client mClient;
 
     /**
      * Stores the time of the most recent left button single tap processed.
      */
     private long mLastTapTimeInMs = 0;
 
     /**
      * Stores the position of the last left button single tap processed.
      */
     private Point mLastTapPoint;
 
     /**
      * The maximum distance, in pixels, between two points in order for them to be considered a
      * double tap gesture.
      */
     private final int mDoubleTapSlopSquareInPx;
 
     /**
      * The interval, measured in milliseconds, in which two consecutive left button taps must
      * occur in order to be considered a double tap gesture.
      */
     private final long mDoubleTapDurationInMs;
 
     /** Mouse-button currently held down, or BUTTON_UNDEFINED otherwise. */
     private int mHeldButton = TouchInputHandlerInterface.BUTTON_UNDEFINED;
 
-    public SimulatedTouchInputStrategy(RenderData renderData, Client client, Context context) {
+    public SimulatedTouchInputStrategy(RenderData renderData, Context context) {
         mRenderData = renderData;
-        mClient = client;
 
         ViewConfiguration config = ViewConfiguration.get(context);
         mDoubleTapDurationInMs = config.getDoubleTapTimeout();
 
         // In order to detect whether the user is attempting to double tap a target, we define a
         // region around the first point within which the second tap must occur.  The standard way
         // to do this in an Android UI (meaning a UI comprised of UI elements which conform to the
         // visual guidelines for the platform which are 'Touch Friendly') is to use the
         // getScaledDoubleTapSlop() value for checking this distance (or use a GestureDetector).
         // Our scenario is a bit different as our UI consists of an image of a remote machine where
@@ skipping 51 matching lines @@
 
     @Override
     public boolean onPressAndHold(int button) {
         injectMouseButtonEvent(button, true, getCursorPosition());
         mHeldButton = button;
         return true;
     }
 
     @Override
     public void onScroll(float distanceX, float distanceY) {
-        mClient.sendMouseWheelEvent((int) -distanceX, (int) -distanceY);
+        JniInterface.sendMouseWheelEvent((int) -distanceX, (int) -distanceY);
     }
 
     @Override
     public void onMotionEvent(MotionEvent event) {
         if (event.getActionMasked() == MotionEvent.ACTION_UP
                 && mHeldButton != TouchInputHandlerInterface.BUTTON_UNDEFINED) {
             injectMouseButtonEvent(mHeldButton, false, getCursorPosition());
             mHeldButton = TouchInputHandlerInterface.BUTTON_UNDEFINED;
         }
     }
 
     @Override
     public void injectCursorMoveEvent(int x, int y) {
-        mClient.sendMouseEvent(x, y, TouchInputHandlerInterface.BUTTON_UNDEFINED, false);
+        JniInterface.sendMouseEvent(x, y, TouchInputHandlerInterface.BUTTON_UNDEFINED, false);
     }
 
     @Override
     public DesktopView.InputFeedbackType getShortPressFeedbackType() {
         return DesktopView.InputFeedbackType.SMALL_ANIMATION;
     }
 
     @Override
     public DesktopView.InputFeedbackType getLongPressFeedbackType() {
         return DesktopView.InputFeedbackType.LARGE_ANIMATION;
@@ skipping 24 matching lines @@
             mRenderData.transform.mapPoints(currentValues);
             mRenderData.transform.mapPoints(previousValues);
         }
 
         int deltaX = (int) (currentValues[0] - previousValues[0]);
         int deltaY = (int) (currentValues[1] - previousValues[1]);
         return ((deltaX * deltaX + deltaY * deltaY) <= mDoubleTapSlopSquareInPx);
     }
 
     private void injectMouseButtonEvent(int button, boolean pressed, Point tapPoint) {
-        mClient.sendMouseEvent(tapPoint.x, tapPoint.y, button, pressed);
+        JniInterface.sendMouseEvent(tapPoint.x, tapPoint.y, button, pressed);
     }
 }