[Remoting Android] Make JniClient own JniDisplayHandler

remoting/client/jni/jni_client.h

 // 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.
 
 #ifndef REMOTING_CLIENT_JNI_JNI_CLIENT_H_
 #define REMOTING_CLIENT_JNI_JNI_CLIENT_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 62 matching lines @@
   void HandleExtensionMessage(const std::string& type,
                               const std::string& message);
 
   // Register C++ methods exposed to Java using JNI.
   static bool RegisterJni(JNIEnv* env);
 
   // The following methods are exposed to Java via JNI.
 
   void Connect(JNIEnv* env,
                const base::android::JavaParamRef<jobject>& caller,
-               jlong display_handler_ptr,
                const base::android::JavaParamRef<jstring>& username,
                const base::android::JavaParamRef<jstring>& authToken,
                const base::android::JavaParamRef<jstring>& hostJid,
                const base::android::JavaParamRef<jstring>& hostId,
                const base::android::JavaParamRef<jstring>& hostPubkey,
                const base::android::JavaParamRef<jstring>& pairId,
                const base::android::JavaParamRef<jstring>& pairSecret,
                const base::android::JavaParamRef<jstring>& capabilities,
                const base::android::JavaParamRef<jstring>& flags);
 
@@ skipping 57 matching lines @@
   // TODO(yuweih): Instead of exposing a weak pointer in the public API,
   //               consider handling task posting inside the client.
   base::WeakPtr<JniClient> GetWeakPtr();
 
  private:
   ChromotingJniRuntime* runtime_;
 
   // Reference to the Java client object.
   base::android::ScopedJavaGlobalRef<jobject> java_client_;
 
+  std::unique_ptr<DisplayUpdaterFactory> display_handler_;
+
   // Deleted on UI thread.
   std::unique_ptr<JniPairingSecretFetcher> secret_fetcher_;
 
   // Deleted on Network thread.
   std::unique_ptr<ChromotingJniInstance> session_;
 
   // Holds pointer for the UI thread.
   base::WeakPtrFactory<JniClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JniClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_JNI_JNI_CLIENT_H_