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

remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.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.graphics.Matrix;
 import android.view.MotionEvent;
 
 import org.chromium.base.VisibleForTesting;
-import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.JniInterface;
 import org.chromium.chromoting.jni.TouchEventData;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 
 /**
  * This class receives local touch input events and forwards them to the remote host.
  * A queue of MotionEvents is built up and then either transmitted to the remote host if one of its
  * remote gesture handler methods is called (such as onScroll) or it is cleared if the current
  * stream of events does not represent a remote gesture.
  * NOTE: Not all touch gestures are remoted.  Touch input and gestures outside the supported ones
  *       (which includes tapping and 2 finger panning) will either affect the local canvas or
  *       will be dropped/ignored.
  */
 public class TouchInputStrategy implements InputStrategyInterface {
     /**
      * This interface abstracts the injection mechanism to allow for unit testing.
      */
     public interface RemoteInputInjector {
         public void injectMouseEvent(int x, int y, int button, boolean buttonDown);
         public void injectTouchEvent(TouchEventData.EventType eventType, TouchEventData[] data);
     }
 
     /**
      * This class provides the default implementation for injecting remote events.
      */
-    private class DefaultInputInjector implements RemoteInputInjector {
+    private static class DefaultInputInjector implements RemoteInputInjector {
         @Override
         public void injectMouseEvent(int x, int y, int button, boolean buttonDown) {
-            mClient.sendMouseEvent(x, y, button, buttonDown);
+            JniInterface.sendMouseEvent(x, y, button, buttonDown);
         }
 
         @Override
         public void injectTouchEvent(TouchEventData.EventType eventType, TouchEventData[] data) {
-            mClient.sendTouchEvent(eventType, data);
+            JniInterface.sendTouchEvent(eventType, data);
         }
     }
 
     /**
      * Contains the maximum number of MotionEvents to store before cancelling the current gesture.
      * The size is ~3x the largest number of events seen during any remotable gesture sequence.
      */
     private static final int QUEUED_EVENT_THRESHOLD = 50;
 
     /**
@@ skipping 11 matching lines @@
     private boolean mInRemoteGesture = false;
 
     /**
      * Indicates whether MotionEvents and gestures should be acted upon or ignored.  This flag is
      * set when we believe that the current sequence of events is not something we should remote.
      */
     private boolean mIgnoreTouchEvents = false;
 
     private final RenderData mRenderData;
 
-    private final Client mClient;
-
     private RemoteInputInjector mRemoteInputInjector;
 
-    public TouchInputStrategy(RenderData renderData, Client client) {
+    public TouchInputStrategy(RenderData renderData) {
         mRenderData = renderData;
-        mClient = client;
         mRemoteInputInjector = new DefaultInputInjector();
         mQueuedEvents = new LinkedList<MotionEvent>();
 
         synchronized (mRenderData) {
             mRenderData.drawCursor = false;
         }
     }
 
     @Override
     public boolean onTap(int button) {
@@ skipping 213 matching lines @@
 
         return event;
     }
 
     private void resetStateData() {
         clearQueuedEvents();
         mInRemoteGesture = false;
         mIgnoreTouchEvents = false;
     }
 }