Pull out common code from client and host versions of ServerLogEntry.

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 "net/socket/client_socket_factory.h"
 #include "remoting/client/audio_player.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/server_log_entry.h"
 #include "remoting/client/software_video_renderer.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/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
+#include "remoting/protocol/server_log_entry.h"

[rmsousa, 2014/05/20 00:54:41]

Nit: Not sure if protocol is the right long-term home for it - protocol/ mostly
contains the the client-host protocol.
On the other hand, there isn't really any other good place for code that is
common between client and host but not part of the protocol... (base/ can't
depend on jingle_glue, and jingle_glue/ itself mostly contains low-level stuff).

[Lambros, 2014/05/20 01:13:35]

It would be slightly cleaner without the protocol:: namespace, certainly. But
I'm not sure what else to do with this. @Sergey, any thoughts?

[Sergey Ulanov, 2014/05/21 04:02:36]

Hm. Good question. I suggest putting this stuff in jingle_glue for now. In the
past jingle_glue was used for libjingle adapters and such, but currently it
contains mostly signaling code. Server-side logging looks like it belongs to
signaling layer (but it's arguable). Later we should rename
'jingle_glue'->'signaling' and move chromium_port_allocator and
chromium_socket_factory to remoting/protocol. jingle_glue is a crappy name
anyway, and it's easily confused with jingle/glue. WDYT?

 
 namespace remoting {
 
 namespace {
 
 // TODO(solb) Move into location shared with client plugin.
 const char* const kXmppServer = "talk.google.com";
 const int kXmppPort = 5222;
 const bool kXmppUseTls = true;
 
@@ skipping 296 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(client::ServerLogEntry::ME2ME,
+  log_to_server_.reset(new client::LogToServer(protocol::ServerLogEntry::ME2ME,
                                                signaling_.get(),
                                                "remoting@bot.talk.google.com"));
 
   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));
 
@@ skipping 80 matching lines @@
                       stats->round_trip_ms()->Average());
 
   log_to_server_->LogStatistics(stats);
 
   jni_runtime_->network_task_runner()->PostDelayedTask(
       FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this),
       base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs));
 }
 
 }  // namespace remoting