Revert of [Android Client] Move session-scoped native interface into JniClient

remoting/client/jni/chromoting_jni_instance.cc

Index: remoting/client/jni/chromoting_jni_instance.cc
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc
index 6c8c1cb77874910385fb546e2d29df6ae1c04fb9..e63e2b4c31c0a962dcc2b1593002cd8596db0544 100644
--- a/remoting/client/jni/chromoting_jni_instance.cc
+++ b/remoting/client/jni/chromoting_jni_instance.cc
@@ -21,7 +21,6 @@
 #include "remoting/client/client_telemetry_logger.h"
 #include "remoting/client/jni/android_keymap.h"
 #include "remoting/client/jni/chromoting_jni_runtime.h"
-#include "remoting/client/jni/jni_client.h"
 #include "remoting/client/jni/jni_frame_consumer.h"
 #include "remoting/client/software_video_renderer.h"
 #include "remoting/protocol/chromium_port_allocator_factory.h"
@@ -49,7 +48,6 @@
 }
 
 ChromotingJniInstance::ChromotingJniInstance(ChromotingJniRuntime* jni_runtime,
-                                             JniClient* jni_client,
                                              const std::string& username,
                                              const std::string& auth_token,
                                              const std::string& host_jid,
@@ -60,7 +58,6 @@
                                              const std::string& capabilities,
                                              const std::string& flags)
     : jni_runtime_(jni_runtime),
-      jni_client_(jni_client),
       host_jid_(host_jid),
       flags_(flags),
       capabilities_(capabilities),
@@ -145,8 +142,8 @@
 
   third_party_token_fetched_callback_ = token_fetched_callback;
   jni_runtime_->ui_task_runner()->PostTask(
-      FROM_HERE, base::Bind(&JniClient::FetchThirdPartyToken,
-                            jni_client_->GetWeakPtr(), token_url,
+      FROM_HERE, base::Bind(&ChromotingJniRuntime::FetchThirdPartyToken,
+                            base::Unretained(jni_runtime_), token_url,
                             host_public_key, scope));
 }
 
@@ -192,7 +189,7 @@
     return;
   }
 
-  jni_client_->RedrawCanvas();
+  jni_runtime_->RedrawCanvas();
 }
 
 void ChromotingJniInstance::SendMouseEvent(
@@ -326,8 +323,8 @@
 
   jni_runtime_->ui_task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&JniClient::OnConnectionState,
-                 jni_client_->GetWeakPtr(),
+      base::Bind(&ChromotingJniRuntime::OnConnectionState,
+                 base::Unretained(jni_runtime_),
                  state,
                  error));
 }
@@ -346,24 +343,24 @@
 
 void ChromotingJniInstance::SetCapabilities(const std::string& capabilities) {
   jni_runtime_->ui_task_runner()->PostTask(
-      FROM_HERE, base::Bind(&JniClient::SetCapabilities,
-                            jni_client_->GetWeakPtr(), capabilities));
+      FROM_HERE, base::Bind(&ChromotingJniRuntime::SetCapabilities,
+                            base::Unretained(jni_runtime_), capabilities));
 }
 
 void ChromotingJniInstance::SetPairingResponse(
     const protocol::PairingResponse& response) {
   jni_runtime_->ui_task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&JniClient::CommitPairingCredentials,
-                 jni_client_->GetWeakPtr(), client_auth_config_.host_id,
+      base::Bind(&ChromotingJniRuntime::CommitPairingCredentials,
+                 base::Unretained(jni_runtime_), client_auth_config_.host_id,
                  response.client_id(), response.shared_secret()));
 }
 
 void ChromotingJniInstance::DeliverHostMessage(
     const protocol::ExtensionMessage& message) {
   jni_runtime_->ui_task_runner()->PostTask(
-      FROM_HERE, base::Bind(&JniClient::HandleExtensionMessage,
-                            jni_client_->GetWeakPtr(), message.type(),
+      FROM_HERE, base::Bind(&ChromotingJniRuntime::HandleExtensionMessage,
+                            base::Unretained(jni_runtime_), message.type(),
                             message.data()));
 }
 
@@ -395,7 +392,7 @@
     return;
   }
 
-  jni_client_->UpdateCursorShape(shape);
+  jni_runtime_->UpdateCursorShape(shape);
 }
 
 void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
@@ -408,7 +405,7 @@
 
   perf_tracker_.reset(new protocol::PerformanceTracker());
 
-  view_.reset(new JniFrameConsumer(jni_runtime_, jni_client_));
+  view_.reset(new JniFrameConsumer(jni_runtime_));
   video_renderer_.reset(new SoftwareVideoRenderer(
       client_context_->decode_task_runner(), view_.get(), perf_tracker_.get()));
 
@@ -455,10 +452,10 @@
   }
 
   // Delete pairing credentials if they exist.
-  jni_client_->CommitPairingCredentials(client_auth_config_.host_id, "", "");
+  jni_runtime_->CommitPairingCredentials(client_auth_config_.host_id, "", "");
 
   pin_callback_ = callback;
-  jni_client_->DisplayAuthenticationPrompt(pairable);
+  jni_runtime_->DisplayAuthenticationPrompt(pairable);
 }
 
 void ChromotingJniInstance::SetDeviceName(const std::string& device_name) {