Pull out common code from client and host versions of LogToServer

remoting/client/jni/chromoting_jni_instance.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_instance.h"
 
 #include <android/log.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/socket/client_socket_factory.h"
 #include "remoting/base/service_urls.h"
 #include "remoting/client/audio_player.h"
+#include "remoting/client/client_status_logger.h"
 #include "remoting/client/jni/android_keymap.h"
 #include "remoting/client/jni/chromoting_jni_runtime.h"
-#include "remoting/client/log_to_server.h"
 #include "remoting/client/software_video_renderer.h"
 #include "remoting/client/token_fetcher_proxy.h"
 #include "remoting/jingle_glue/chromium_port_allocator.h"
 #include "remoting/jingle_glue/chromium_socket_factory.h"
 #include "remoting/jingle_glue/network_settings.h"
 #include "remoting/jingle_glue/server_log_entry.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 
 namespace remoting {
@@ skipping 219 matching lines @@
     video_renderer_->GetStats()->video_paint_ms()->Record(paint_time_ms);
 }
 
 void ChromotingJniInstance::OnConnectionState(
     protocol::ConnectionToHost::State state,
     protocol::ErrorCode error) {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
 
   EnableStatsLogging(state == protocol::ConnectionToHost::CONNECTED);
 
-  log_to_server_->LogSessionStateChange(state, error);
+  client_status_logger_->LogSessionStateChange(state, error);
 
   if (create_pairing_ && state == protocol::ConnectionToHost::CONNECTED) {
     protocol::PairingRequest request;
     DCHECK(!device_name_.empty());
     request.set_client_name(device_name_);
     connection_->host_stub()->RequestPairing(request);
   }
 
   jni_runtime_->ui_task_runner()->PostTask(
       FROM_HERE,
@@ skipping 103 matching lines @@
 
   client_.reset(new ChromotingClient(
       client_config_, client_context_.get(), connection_.get(),
       this, video_renderer_.get(), scoped_ptr<AudioPlayer>()));
 
 
   signaling_.reset(new XmppSignalStrategy(
       net::ClientSocketFactory::GetDefaultFactory(),
       jni_runtime_->url_requester(), xmpp_config_));
 
-  log_to_server_.reset(
-      new client::LogToServer(ServerLogEntry::ME2ME,
-                              signaling_.get(),
-                              ServiceUrls::GetInstance()->directory_bot_jid()));
+  client_status_logger_.reset(
+      new ClientStatusLogger(ServerLogEntry::ME2ME,
+                             signaling_.get(),
+                             ServiceUrls::GetInstance()->directory_bot_jid()));
 
   NetworkSettings network_settings(NetworkSettings::NAT_TRAVERSAL_FULL);
 
   // Use Chrome's network stack to allocate ports for peer-to-peer channels.
   scoped_ptr<ChromiumPortAllocator> port_allocator(
       ChromiumPortAllocator::Create(jni_runtime_->url_requester(),
                                     network_settings));
 
   scoped_ptr<protocol::TransportFactory> transport_factory(
       new protocol::LibjingleTransportFactory(
           signaling_.get(),
           port_allocator.PassAs<cricket::HttpPortAllocatorBase>(),
           network_settings));
 
   client_->Start(signaling_.get(), transport_factory.Pass());
 }
 
 void ChromotingJniInstance::DisconnectFromHostOnNetworkThread() {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
 
   host_id_.clear();
 
   stats_logging_enabled_ = false;
 
   // |client_| must be torn down before |signaling_|.
   connection_.reset();
   client_.reset();
-  log_to_server_.reset();
+  client_status_logger_.reset();
 }
 
 void ChromotingJniInstance::FetchSecret(
     bool pairable,
     const protocol::SecretFetchedCallback& callback) {
   if (!jni_runtime_->ui_task_runner()->BelongsToCurrentThread()) {
     jni_runtime_->ui_task_runner()->PostTask(
         FROM_HERE, base::Bind(&ChromotingJniInstance::FetchSecret,
                               this, pairable, callback));
     return;
@@ skipping 58 matching lines @@
                       "Bandwidth:%.0f FrameRate:%.1f Capture:%.1f Encode:%.1f "
                       "Decode:%.1f Render:%.1f Latency:%.0f",
                       stats->video_bandwidth()->Rate(),
                       stats->video_frame_rate()->Rate(),
                       stats->video_capture_ms()->Average(),
                       stats->video_encode_ms()->Average(),
                       stats->video_decode_ms()->Average(),
                       stats->video_paint_ms()->Average(),
                       stats->round_trip_ms()->Average());
 
-  log_to_server_->LogStatistics(stats);
+  client_status_logger_->LogStatistics(stats);
 
   jni_runtime_->network_task_runner()->PostDelayedTask(
       FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this),
       base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs));
 }
 
 }  // namespace remoting