Refactoring out the chromoting jni runtime class in favor of chromoting client runtime.

remoting/client/jni/jni_client.cc

 // Copyright 2016 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.
 
 #include "remoting/client/jni/jni_client.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "jni/Client_jni.h"
+#include "remoting/client/chromoting_client_runtime.h"
 #include "remoting/client/jni/chromoting_jni_instance.h"
-#include "remoting/client/jni/chromoting_jni_runtime.h"
 #include "remoting/client/jni/connect_to_host_info.h"
 #include "remoting/client/jni/jni_gl_display_handler.h"
 #include "remoting/client/jni/jni_pairing_secret_fetcher.h"
 #include "remoting/client/jni/jni_touch_event_data.h"
 #include "remoting/protocol/video_renderer.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace remoting {
 
-JniClient::JniClient(ChromotingJniRuntime* runtime,
-                     base::android::ScopedJavaGlobalRef<jobject> java_client)
-    : runtime_(runtime),
-      java_client_(java_client),
-      weak_factory_(this) {
+JniClient::JniClient(base::android::ScopedJavaGlobalRef<jobject> java_client)
+    : java_client_(java_client), weak_factory_(this) {
+  runtime_ = ChromotingClientRuntime::GetInstance();
   weak_ptr_ = weak_factory_.GetWeakPtr();
 }
 
 JniClient::~JniClient() {
   DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread());
 
   // The session must be shut down first, since it depends on our other
   // components' still being alive.
   DisconnectFromHost();
 }
 
 void JniClient::ConnectToHost(const ConnectToHostInfo& info) {
   DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread());
   DCHECK(!display_handler_);
   DCHECK(!session_);
   DCHECK(!secret_fetcher_);
-  display_handler_.reset(new JniGlDisplayHandler(runtime_, java_client_));
+  display_handler_.reset(new JniGlDisplayHandler(java_client_));
   secret_fetcher_.reset(
-      new JniPairingSecretFetcher(runtime_, GetWeakPtr(), info.host_id));
-  session_.reset(new ChromotingJniInstance(
-      runtime_, GetWeakPtr(), secret_fetcher_->GetWeakPtr(),
-      display_handler_->CreateCursorShapeStub(),
-      display_handler_->CreateVideoRenderer(), info));
+      new JniPairingSecretFetcher(GetWeakPtr(), info.host_id));
+  session_.reset(
+      new ChromotingJniInstance(GetWeakPtr(), secret_fetcher_->GetWeakPtr(),
+                                display_handler_->CreateCursorShapeStub(),
+                                display_handler_->CreateVideoRenderer(), info));
   session_->Connect();
 }
 
 void JniClient::DisconnectFromHost() {
   DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread());
   if (session_) {
     session_->Disconnect();
     runtime_->network_task_runner()->DeleteSoon(FROM_HERE,
                                                 session_.release());
   }
@@ skipping 216 matching lines @@
 void JniClient::Destroy(JNIEnv* env, const JavaParamRef<jobject>& caller) {
   delete this;
 }
 
 base::WeakPtr<JniClient> JniClient::GetWeakPtr() {
   return weak_ptr_;
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& caller) {
   return reinterpret_cast<intptr_t>(
-      new JniClient(ChromotingJniRuntime::GetInstance(),
-                    base::android::ScopedJavaGlobalRef<jobject>(env, caller)));
+      new JniClient(base::android::ScopedJavaGlobalRef<jobject>(env, caller)));
 }
 
 }  // namespace remoting