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

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"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/cursor_shape_stub.h"
 
 namespace remoting {
 
-class ChromotingJniRuntime;
+class ChromotingClientRuntime;
 class ChromotingJniInstance;
 class JniGlDisplayHandler;
 class JniPairingSecretFetcher;
 
 struct ConnectToHostInfo;
 
 // Houses resources scoped to a session and exposes JNI interface to the
 // Java client during a session. All its methods should be invoked exclusively
 // from the UI thread unless otherwise noted.
 class JniClient {
  public:
-  JniClient(ChromotingJniRuntime* runtime,
-            base::android::ScopedJavaGlobalRef<jobject> java_client);
+  JniClient(base::android::ScopedJavaGlobalRef<jobject> java_client);
   virtual ~JniClient();
 
   // Initiates a connection with the specified host. To skip the attempt at
   // pair-based authentication, leave |pairing_id| and |pairing_secret| as
   // empty strings.
   void ConnectToHost(const ConnectToHostInfo& info);
 
   // Terminates any ongoing connection attempt and cleans up by nullifying
   // |session_|. This is a no-op unless |session| is currently non-null.
   void DisconnectFromHost();
@@ skipping 100 matching lines @@
 
   // Deletes this object.
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& caller);
 
   // Get the weak pointer of the object. Should be used on the UI thread.
   // 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_;
+  ChromotingClientRuntime* runtime_;
 
   // Reference to the Java client object.
   base::android::ScopedJavaGlobalRef<jobject> java_client_;
 
   std::unique_ptr<JniGlDisplayHandler> 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::WeakPtr<JniClient> weak_ptr_;
   base::WeakPtrFactory<JniClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JniClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_JNI_JNI_CLIENT_H_