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

remoting/client/jni/chromoting_jni_instance.h

 // Copyright 2013 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_CHROMOTING_JNI_INSTANCE_H_
 #define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 13 matching lines @@
 namespace remoting {
 
 namespace protocol {
 class ClipboardEvent;
 class CursorShapeInfo;
 class PerformanceTracker;
 class VideoRenderer;
 }  // namespace protocol
 
 class ChromotingJniRuntime;
+class JniClient;
 class JniFrameConsumer;
 
 // ClientUserInterface that indirectly makes and receives JNI calls.
 class ChromotingJniInstance
   : public ClientUserInterface,
     public protocol::ClipboardStub,
     public protocol::CursorShapeStub,
     public base::RefCountedThreadSafe<ChromotingJniInstance> {
  public:
   // Initiates a connection with the specified host. Call from the UI thread.
   // The instance does not take ownership of |jni_runtime|. To connect with an
   // unpaired host, pass in |pairing_id| and |pairing_secret| as empty strings.
   ChromotingJniInstance(ChromotingJniRuntime* jni_runtime,
+                        JniClient* jni_client,
                         const std::string& username,
                         const std::string& auth_token,
                         const std::string& host_jid,
                         const std::string& host_id,
                         const std::string& host_pubkey,
                         const std::string& pairing_id,
                         const std::string& pairing_secret,
                         const std::string& capabilities,
                         const std::string& flags);
 
@@ skipping 84 matching lines @@
   void EnableStatsLogging(bool enabled);
 
   // If logging is enabled, logs the current connection statistics, and
   // triggers another call to this function after the logging time interval.
   // Called on the network thread.
   void LogPerfStats();
 
   // Used to obtain task runner references and make calls to Java methods.
   ChromotingJniRuntime* jni_runtime_;
 
+  JniClient* jni_client_;
+
   // ID of the host we are connecting to.
   std::string host_jid_;
 
   protocol::ClientAuthenticationConfig client_auth_config_;
 
   std::string flags_;
 
   // This group of variables is to be used on the network thread.
   std::unique_ptr<ClientContext> client_context_;
   std::unique_ptr<protocol::PerformanceTracker> perf_tracker_;
@@ skipping 34 matching lines @@
   friend class base::RefCountedThreadSafe<ChromotingJniInstance>;
 
   base::WeakPtrFactory<ChromotingJniInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance);
 };
 
 }  // namespace remoting
 
 #endif