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

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

Index: remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java b/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
index 19d70e3189c315ed9a92491d3c2fa0020d96ab54..488760bf15f6b2373de7bcdd28f0ce9f9d5c37e2 100644
--- a/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
+++ b/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
@@ -8,7 +8,7 @@
 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;
@@ -37,15 +37,15 @@
     /**
      * 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);
         }
     }
 
@@ -77,13 +77,10 @@
 
     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>();