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

remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java

Index: remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java
index d987f6b3758f11751b588ec1c1cf83eb092ee457..ded464bf1d0bb22ca593b71b83adf1703a287a25 100644
--- a/remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java
@@ -11,7 +11,7 @@
 import android.graphics.Point;
 import android.opengl.GLES20;
 
-import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.JniInterface;
 
 import java.nio.FloatBuffer;
 
@@ -61,8 +61,6 @@
     // Number of vertices passed to glDrawArrays().
     private static final int VERTICES_NUMBER = 6;
 
-    private final Client mClient;
-
     private int mVertexShaderHandle;
     private int mFragmentShaderHandle;
     private int mProgramHandle;
@@ -89,8 +87,7 @@
     // Lock to allow multithreaded access to mReloadTexture.
     private final Object mReloadTextureLock = new Object();
 
-    public Desktop(Client client) {
-        mClient = client;
+    public Desktop() {
         mVertexShaderHandle =
                 ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, VERTEX_SHADER);
         mFragmentShaderHandle =
@@ -223,7 +220,7 @@
         }
 
         // TODO(shichengfeng): Record the time desktop drawing takes.
-        Bitmap bitmap = mClient.getVideoFrame();
+        Bitmap bitmap = JniInterface.getVideoFrame();
 
         if (bitmap == null) {
             // This can happen if the client is connected, but a complete video frame has not yet
@@ -247,4 +244,4 @@
             mReloadTexture = true;
         }
     }
-}
+}