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

remoting/host/log_to_server.cc

 // Copyright (c) 2012 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/host/log_to_server.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/host_status_monitor.h"
-#include "remoting/host/server_log_entry.h"
+#include "remoting/host/server_log_entry_host.h"
 #include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/protocol/server_log_entry.h"
 #include "remoting/protocol/transport.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
+using remoting::protocol::ServerLogEntry;
 
 namespace remoting {
 
 LogToServer::LogToServer(base::WeakPtr<HostStatusMonitor> monitor,
                          ServerLogEntry::Mode mode,
                          SignalStrategy* signal_strategy,
                          const std::string& directory_bot_jid)
     : monitor_(monitor),
       mode_(mode),
       signal_strategy_(signal_strategy),
       directory_bot_jid_(directory_bot_jid) {
   monitor_->AddStatusObserver(this);
   signal_strategy_->AddListener(this);
 }
 
 LogToServer::~LogToServer() {
   signal_strategy_->RemoveListener(this);
   if (monitor_.get())
     monitor_->RemoveStatusObserver(this);
 }
 
 void LogToServer::LogSessionStateChange(const std::string& jid,
                                         bool connected) {
   DCHECK(CalledOnValidThread());
 
   scoped_ptr<ServerLogEntry> entry(
-      ServerLogEntry::MakeForSessionStateChange(connected));
-  entry->AddHostFields();
+      MakeLogEntryForSessionStateChange(connected));
+  AddHostFieldsToLogEntry(entry.get());
   entry->AddModeField(mode_);
 
   if (connected) {
     DCHECK(connection_route_type_.count(jid) == 1);
-    entry->AddConnectionTypeField(connection_route_type_[jid]);
+    AddConnectionTypeToLogEntry(entry.get(), connection_route_type_[jid]);
   }
   Log(*entry.get());
 }
 
 void LogToServer::OnSignalStrategyStateChange(SignalStrategy::State state) {
   DCHECK(CalledOnValidThread());
 
   if (state == SignalStrategy::CONNECTED) {
     iq_sender_.reset(new IqSender(signal_strategy_));
     SendPendingEntries();
@@ skipping 49 matching lines @@
   }
   // Send the stanza to the server.
   scoped_ptr<IqRequest> req = iq_sender_->SendIq(
       buzz::STR_SET, directory_bot_jid_, stanza.Pass(),
       IqSender::ReplyCallback());
   // We ignore any response, so let the IqRequest be destroyed.
   return;
 }
 
 }  // namespace remoting