Refactoring and rewriting the chromoting jni instance to be chromoting session.

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/client/chromoting_session.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/cursor_shape_stub.h"
 
 namespace remoting {
 
+class AudioPlayerAndroid;
 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 {
+class JniClient : public ChromotingSession::Delegate {
  public:
   JniClient(base::android::ScopedJavaGlobalRef<jobject> java_client);
-  virtual ~JniClient();
+  ~JniClient() override;
 
   // 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();
 
-  // Notifies Java code of the current connection status. Call on UI thread.
-  void OnConnectionState(protocol::ConnectionToHost::State state,
-                         protocol::ErrorCode error);
-
   // Pops up a dialog box asking the user to enter a PIN. Call on UI thread.
   void DisplayAuthenticationPrompt(bool pairing_supported);
 
+  // Register C++ methods exposed to Java using JNI.
+  static bool RegisterJni(JNIEnv* env);
+
+  // ChromotingSession::Delegate implementation
+
+  // Notifies Java code of the current connection status. Call on UI thread.
+  void OnConnectionState(protocol::ConnectionToHost::State state,
+                         protocol::ErrorCode error) override;
+
   // Saves new pairing credentials to permanent storage. Call on UI thread.
   void CommitPairingCredentials(const std::string& host,
                                 const std::string& id,
-                                const std::string& secret);
+                                const std::string& secret) override;
 
   // Pops up a third party login page to fetch token required for
   // authentication. Call on UI thread.
   void FetchThirdPartyToken(const std::string& token_url,
                             const std::string& client_id,
-                            const std::string& scope);
+                            const std::string& scope) override;
 
   // Pass on the set of negotiated capabilities to the client.
-  void SetCapabilities(const std::string& capabilities);
+  void SetCapabilities(const std::string& capabilities) override;
 
   // Passes on the deconstructed ExtensionMessage to the client to handle
   // appropriately.
   void HandleExtensionMessage(const std::string& type,
-                              const std::string& message);
-
-  // Register C++ methods exposed to Java using JNI.
-  static bool RegisterJni(JNIEnv* env);
+                              const std::string& message) override;
 
   // The following methods are exposed to Java via JNI.
 
   // TODO(yuweih): Pass a class/struct from Java holding all these arguments.
   void Connect(JNIEnv* env,
                const base::android::JavaParamRef<jobject>& caller,
                const base::android::JavaParamRef<jstring>& username,
                const base::android::JavaParamRef<jstring>& auth_token,
                const base::android::JavaParamRef<jstring>& host_jid,
                const base::android::JavaParamRef<jstring>& host_id,
@@ skipping 67 matching lines @@
   //               consider handling task posting inside the client.
   base::WeakPtr<JniClient> GetWeakPtr();
 
  private:
   ChromotingClientRuntime* runtime_;
 
   // Reference to the Java client object.
   base::android::ScopedJavaGlobalRef<jobject> java_client_;
 
   std::unique_ptr<JniGlDisplayHandler> display_handler_;
+  std::unique_ptr<AudioPlayerAndroid> audio_player_;
 
   // Deleted on UI thread.
   std::unique_ptr<JniPairingSecretFetcher> secret_fetcher_;
 
   // Deleted on Network thread.
-  std::unique_ptr<ChromotingJniInstance> session_;
+  std::unique_ptr<ChromotingSession> 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_