[Remoting Android] Refactor ClientTelemetryLogger

remoting/client/jni/chromoting_jni_runtime.cc

 // 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.
 
 #include "remoting/client/jni/chromoting_jni_runtime.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/library_loader/library_loader_hooks.h"
@@ skipping 31 matching lines @@
 static void LoadNative(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   base::CommandLine::Init(0, nullptr);
 
   // Create the singleton now so that the Chromoting threads will be set up.
   remoting::ChromotingJniRuntime::GetInstance();
 }
 
 static void HandleAuthTokenOnNetworkThread(const std::string& token) {
   ChromotingJniRuntime* runtime = remoting::ChromotingJniRuntime::GetInstance();
   DCHECK(runtime->network_task_runner()->BelongsToCurrentThread());
-  runtime->logger()->SetAuthToken(token);
+  runtime->GetLogWriter()->SetAuthToken(token);
 }
 
 static void OnAuthTokenFetched(JNIEnv* env,
                          const JavaParamRef<jclass>& clazz,
                          const JavaParamRef<jstring>& token) {
   ChromotingJniRuntime* runtime = remoting::ChromotingJniRuntime::GetInstance();
   runtime->network_task_runner()->PostTask(
       FROM_HERE, base::Bind(&HandleAuthTokenOnNetworkThread,
                             ConvertJavaStringToUTF8(env, token)));
 }
@@ skipping 40 matching lines @@
                             base::Unretained(this), &done_event));
   done_event.Wait();
   display_task_runner()->PostTask(
       FROM_HERE, base::Bind(&ChromotingJniRuntime::DetachFromVmAndSignal,
                             base::Unretained(this), &done_event));
   done_event.Wait();
   base::android::LibraryLoaderExitHook();
   base::android::DetachFromVM();
 }
 
+TelemetryLogWriter* ChromotingJniRuntime::GetLogWriter() {
+  DCHECK(runtime_->network_task_runner()->BelongsToCurrentThread());
+  return log_writer_.get();
+}
+
 void ChromotingJniRuntime::FetchAuthToken() {
   if (!ui_task_runner()->BelongsToCurrentThread()) {
     ui_task_runner()->PostTask(
         FROM_HERE, base::Bind(&ChromotingJniRuntime::FetchAuthToken,
                               base::Unretained(this)));
     return;
   }
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_JniInterface_fetchAuthToken(env);
 }
 
 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) {
   base::android::DetachFromVM();
   waiter->Signal();
 }
 
 void ChromotingJniRuntime::StartLoggerOnNetworkThread() {
   DCHECK(network_task_runner()->BelongsToCurrentThread());
-  logger_.reset(new ClientTelemetryLogger(ChromotingEvent::Mode::ME2ME));
-  logger_->Start(
-      base::MakeUnique<ChromiumUrlRequestFactory>(runtime_->url_requester()),
-      kTelemetryBaseUrl);
-  logger_->SetAuthClosure(
+  log_writer_.reset(new TelemetryLogWriter(
+      kTelemetryBaseUrl,
+      base::MakeUnique<ChromiumUrlRequestFactory>(runtime_->url_requester())));
+  log_writer_->SetAuthClosure(
       base::Bind(&ChromotingJniRuntime::FetchAuthToken,
                  base::Unretained(this)));
 }
 
 }  // namespace remoting