[Remoting Android] Refactor ClientTelemetryLogger

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 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);
   virtual ~JniClient();
 
-  // TODO(yuweih): Put these arguments into a struct.
   // 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 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,
-                     const std::string& host_version,
-                     const std::string& host_os,
-                     const std::string& host_os_version);
+  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.
@@ skipping 16 matching lines @@
   // 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);
 
   // 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>& authToken,
-               const base::android::JavaParamRef<jstring>& hostJid,
-               const base::android::JavaParamRef<jstring>& hostId,
-               const base::android::JavaParamRef<jstring>& hostPubkey,
-               const base::android::JavaParamRef<jstring>& pairId,
-               const base::android::JavaParamRef<jstring>& pairSecret,
+               const base::android::JavaParamRef<jstring>& auth_token,
+               const base::android::JavaParamRef<jstring>& host_jid,
+               const base::android::JavaParamRef<jstring>& host_id,
+               const base::android::JavaParamRef<jstring>& host_pubkey,
+               const base::android::JavaParamRef<jstring>& pair_id,
+               const base::android::JavaParamRef<jstring>& pair_secret,
                const base::android::JavaParamRef<jstring>& capabilities,
                const base::android::JavaParamRef<jstring>& flags,
                const base::android::JavaParamRef<jstring>& host_version,
                const base::android::JavaParamRef<jstring>& host_os,
                const base::android::JavaParamRef<jstring>& host_os_version);
 
   void Disconnect(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& caller);
 
   void AuthenticationResponse(
@@ skipping 71 matching lines @@
   // 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_