[Remoting Android] Make JniClient own JniDisplayHandler

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 4e27111c2342f85209b348e446aaf811ce098d57..b8dac71deaead3934abc46e7ebd3981feacbfbcd 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.Bitmap;
 import android.graphics.Point;
 import android.opengl.GLES20;
 
-import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.Display;
 
 import java.nio.FloatBuffer;
 
@@ -61,7 +61,7 @@ public class Desktop {
     // Number of vertices passed to glDrawArrays().
     private static final int VERTICES_NUMBER = 6;
 
-    private final Client mClient;
+    private final Display mDisplay;
 
     private int mVertexShaderHandle;
     private int mFragmentShaderHandle;
@@ -89,8 +89,8 @@ public class Desktop {
     // Lock to allow multithreaded access to mReloadTexture.
     private final Object mReloadTextureLock = new Object();
 
-    public Desktop(Client client) {
-        mClient = client;
+    public Desktop(Display display) {
+        mDisplay = display;
         mVertexShaderHandle =
                 ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, VERTEX_SHADER);
         mFragmentShaderHandle =
@@ -223,7 +223,7 @@ public class Desktop {
         }
 
         // TODO(shichengfeng): Record the time desktop drawing takes.
-        Bitmap bitmap = mClient.getDisplay().getVideoFrame();
+        Bitmap bitmap = mDisplay.getVideoFrame();
 
         if (bitmap == null) {
             // This can happen if the client is connected, but a complete video frame has not yet