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

remoting/host/host_status_sender.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/host/host_status_sender.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringize_macros.h"
 #include "base/time/time.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.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 "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 {
 
 namespace {
 
 const char kHostStatusTag[] = "host-status";
 const char kHostIdAttr[] = "hostid";
 const char kExitCodeAttr[] = "exit-code";
 const char kHostVersionTag[] = "host-version";
 const char kSignatureTag[] = "signature";
@@ skipping 86 matching lines @@
 
   // Append host version.
   scoped_ptr<XmlElement> version_tag(new XmlElement(
       QName(kChromotingXmlNamespace, kHostVersionTag)));
   version_tag->AddText(STRINGIZE(VERSION));
   host_status->AddElement(version_tag.release());
 
   // Append log message (which isn't signed).
   scoped_ptr<XmlElement> log(ServerLogEntry::MakeStanza());
   scoped_ptr<ServerLogEntry> log_entry(
-      ServerLogEntry::MakeForHostStatus(status, exit_code));
-  log_entry->AddHostFields();
+      MakeLogEntryForHostStatus(status, exit_code));
+  AddHostFieldsToLogEntry(log_entry.get());
   log->AddElement(log_entry->ToStanza().release());
   host_status->AddElement(log.release());
   return host_status.Pass();
 }
 
 scoped_ptr<XmlElement> HostStatusSender::CreateSignature(
     HostStatus status, HostExitCodes exit_code) {
   scoped_ptr<XmlElement> signature_tag(new XmlElement(
       QName(kChromotingXmlNamespace, kSignatureTag)));
 
@@ skipping 15 matching lines @@
   if (status == OFFLINE)
     message += std::string(" ") + ExitCodeToString(exit_code);
 
   std::string signature(key_pair_->SignMessage(message));
   signature_tag->AddText(signature);
 
   return signature_tag.Pass();
 }
 
 }  // namespace remoting