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

remoting/android/javatests/src/org/chromium/chromoting/TouchInputStrategyTest.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.Point;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.MotionEvent;
@@ skipping 179 matching lines @@
     private void injectUpEvent(int id) {
         MotionEvent event = mEventGenerator.obtainUpEvent(id);
         mInputStrategy.onMotionEvent(event);
         event.recycle();
     }
 
     @Override
     public void setUp() {
         mRenderData = new RenderData();
         mRemoteInputInjector = new MockRemoteInputInjector();
-
-        // TODO(lambroslambrou): Provide a mock Client implementation that doesn't call out to JNI,
-        // and mock the Client methods instead of using MockRemoteInputInjector here.
-        mInputStrategy = new TouchInputStrategy(mRenderData, null);
+        mInputStrategy = new TouchInputStrategy(mRenderData);
         mInputStrategy.setRemoteInputInjectorForTest(mRemoteInputInjector);
         mEventGenerator = new TouchEventGenerator();
 
         mRenderData.screenWidth = SCREEN_SIZE_PX;
         mRenderData.screenHeight = SCREEN_SIZE_PX;
         mRenderData.imageWidth = REMOTE_DESKTOP_SIZE_PX;
         mRenderData.imageHeight = REMOTE_DESKTOP_SIZE_PX;
         mRenderData.transform.postTranslate(-TRANSLATE_OFFSET_PX, -TRANSLATE_OFFSET_PX);
     }
 
@@ skipping 311 matching lines @@
         for (int i = 0; i < 10000; i++) {
             injectMoveEvent(0, fingerOnePosX, i % 10);
             injectMoveEvent(1, fingerTwoPosX, i % 10);
         }
         mRemoteInputInjector.assertNothingInjected();
 
         mInputStrategy.onScroll(0.0f, 0.0f);
         mRemoteInputInjector.assertNothingInjected();
     }
 }