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

remoting/android/java/src/org/chromium/chromoting/cardboard/DesktopActivity.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.cardboard;
 
 import android.content.Intent;
 import android.graphics.PointF;
 import android.os.Bundle;
 import android.speech.RecognitionListener;
 import android.speech.RecognizerIntent;
 import android.speech.SpeechRecognizer;
 
 import com.google.vrtoolkit.cardboard.CardboardActivity;
 import com.google.vrtoolkit.cardboard.CardboardView;
 
 import org.chromium.chromoting.R;
 import org.chromium.chromoting.TouchInputHandler;
-import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.JniInterface;
 
 import java.util.ArrayList;
 
 /**
  * Virtual desktop activity for Cardboard.
  */
 public class DesktopActivity extends CardboardActivity {
     // Flag to indicate whether the current activity is going to switch to normal
     // desktop activity.
     private boolean mSwitchToDesktopActivity;
 
-    private Client mClient;
     private CardboardRenderer mRenderer;
     private SpeechRecognizer mSpeechRecognizer;
 
     // Flag to indicate whether the speech recognizer is listening or not.
     private boolean mIsListening;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.cardboard_desktop);
-
-        mClient = Client.getInstance();
-
         mSwitchToDesktopActivity = false;
         CardboardView cardboardView = (CardboardView) findViewById(R.id.cardboard_view);
-        mRenderer = new CardboardRenderer(this, mClient);
+        mRenderer = new CardboardRenderer(this);
         mIsListening = false;
 
         // Associate a CardboardView.StereoRenderer with cardboard view.
         cardboardView.setRenderer(mRenderer);
 
         // Associate the cardboard view with this activity.
         setCardboardView(cardboardView);
     }
 
     @Override
@@ skipping 14 matching lines @@
                     case ZOOM_OUT:
                         mRenderer.moveAwayFromDesktop();
                         break;
                 }
             } else {
                 mRenderer.setMenuBarVisible(false);
             }
         } else {
             if (mRenderer.isLookingAtDesktop()) {
                 PointF coordinates = mRenderer.getMouseCoordinates();
-                mClient.sendMouseEvent((int) coordinates.x, (int) coordinates.y,
+                JniInterface.sendMouseEvent((int) coordinates.x, (int) coordinates.y,
                         TouchInputHandler.BUTTON_LEFT, true);
-                mClient.sendMouseEvent((int) coordinates.x, (int) coordinates.y,
+                JniInterface.sendMouseEvent((int) coordinates.x, (int) coordinates.y,
                         TouchInputHandler.BUTTON_LEFT, false);
             } else {
                 if (mRenderer.isLookingFarawayFromDesktop()) {
                     getCardboardView().resetHeadTracker();
                 } else {
                     mRenderer.setMenuBarVisible(true);
                 }
             }
         }
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        mClient.enableVideoChannel(true);
+        JniInterface.enableVideoChannel(true);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         if (!mSwitchToDesktopActivity) {
-            mClient.enableVideoChannel(false);
+            JniInterface.enableVideoChannel(false);
         }
         if (mSpeechRecognizer != null) {
             mSpeechRecognizer.stopListening();
         }
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        mClient.enableVideoChannel(true);
+        JniInterface.enableVideoChannel(true);
     }
 
     @Override
     protected void onStop() {
         super.onStop();
         if (mSwitchToDesktopActivity) {
             mSwitchToDesktopActivity = false;
         } else {
-            mClient.enableVideoChannel(false);
+            JniInterface.enableVideoChannel(false);
         }
         if (mSpeechRecognizer != null) {
             mSpeechRecognizer.stopListening();
         }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
         if (mSpeechRecognizer != null) {
@@ skipping 47 matching lines @@
 
         public void onError(int error) {
             mIsListening = false;
         }
 
         public void onResults(Bundle results) {
             // TODO(shichengfeng): If necessary, provide a list of choices for user to pick.
             ArrayList<String> data =
                     results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
             if (!data.isEmpty()) {
-                mClient.sendTextEvent(data.get(0));
+                JniInterface.sendTextEvent(data.get(0));
             }
         }
 
         public void onPartialResults(Bundle partialResults) {
         }
 
         public void onEvent(int eventType, Bundle params) {
         }
     }
 }