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

remoting/host/server_log_entry_host_unittest.cc

Index: remoting/host/server_log_entry_host_unittest.cc
diff --git a/remoting/host/server_log_entry_unittest.cc b/remoting/host/server_log_entry_host_unittest.cc
similarity index 54%
rename from remoting/host/server_log_entry_unittest.cc
rename to remoting/host/server_log_entry_host_unittest.cc
index e2e7853cab2327e248ec6401ab7532472ab2ecf1..7505525970f729d3c7b43ac3fc096e05b6fb4b0c 100644
--- a/remoting/host/server_log_entry_unittest.cc
+++ b/remoting/host/server_log_entry_host_unittest.cc
@@ -4,7 +4,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringize_macros.h"
-#include "remoting/host/server_log_entry.h"
+#include "remoting/host/server_log_entry_host.h"
+#include "remoting/jingle_glue/server_log_entry.h"
+#include "remoting/jingle_glue/server_log_entry_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
@@ -13,57 +15,8 @@ using buzz::XmlElement;
 
 namespace remoting {
 
-class ServerLogEntryTest : public testing::Test {
- protected:
-  // Verifies a logging stanza.
-  // |keyValuePairs| lists the keys that must have specified values, and |keys|
-  // lists the keys that must be present, but may have arbitrary values.
-  // There must be no other keys.
-  static bool VerifyStanza(
-      const std::map<std::string, std::string>& key_value_pairs,
-      const std::set<std::string> keys,
-      const XmlElement* elem,
-      std::string* error) {
-    int attrCount = 0;
-    for (const XmlAttr* attr = elem->FirstAttr(); attr != NULL;
-         attr = attr->NextAttr(), attrCount++) {
-      if (attr->Name().Namespace().length() != 0) {
-        *error = "attribute has non-empty namespace " +
-            attr->Name().Namespace();
-        return false;
-      }
-      const std::string& key = attr->Name().LocalPart();
-      const std::string& value = attr->Value();
-      std::map<std::string, std::string>::const_iterator iter =
-          key_value_pairs.find(key);
-      if (iter == key_value_pairs.end()) {
-        if (keys.find(key) == keys.end()) {
-          *error = "unexpected attribute " + key;
-          return false;
-        }
-      } else {
-        if (iter->second != value) {
-          *error = "attribute " + key + " has value " + iter->second +
-              ": expected " + value;
-          return false;
-        }
-      }
-    }
-    int attr_count_expected = key_value_pairs.size() + keys.size();
-    if (attrCount != attr_count_expected) {
-      std::stringstream s;
-      s << "stanza has " << attrCount << " keys: expected "
-        << attr_count_expected;
-      *error = s.str();
-      return false;
-    }
-    return true;
-  }
-};
-
-TEST_F(ServerLogEntryTest, MakeForSessionStateChange) {
-  scoped_ptr<ServerLogEntry> entry(
-      ServerLogEntry::MakeForSessionStateChange(true));
+TEST(ServerLogEntryHostTest, MakeForSessionStateChange) {
+  scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true));
   scoped_ptr<XmlElement> stanza = entry->ToStanza();
   std::string error;
   std::map<std::string, std::string> key_value_pairs;
@@ -75,8 +28,8 @@ TEST_F(ServerLogEntryTest, MakeForSessionStateChange) {
       << error;
 }
 
-TEST_F(ServerLogEntryTest, MakeForHeartbeat) {
-  scoped_ptr<ServerLogEntry> entry(ServerLogEntry::MakeForHeartbeat());
+TEST(ServerLogEntryHostTest, MakeForHeartbeat) {
+  scoped_ptr<ServerLogEntry> entry(MakeLogEntryForHeartbeat());
   scoped_ptr<XmlElement> stanza = entry->ToStanza();
   std::string error;
   std::map<std::string, std::string> key_value_pairs;
@@ -87,10 +40,9 @@ TEST_F(ServerLogEntryTest, MakeForHeartbeat) {
       << error;
 }
 
-TEST_F(ServerLogEntryTest, AddHostFields) {
-  scoped_ptr<ServerLogEntry> entry(
-      ServerLogEntry::MakeForSessionStateChange(true));
-  entry->AddHostFields();
+TEST(ServerLogEntryHostTest, AddHostFields) {
+  scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true));
+  AddHostFieldsToLogEntry(entry.get());
   scoped_ptr<XmlElement> stanza = entry->ToStanza();
   std::string error;
   std::map<std::string, std::string> key_value_pairs;
@@ -116,9 +68,8 @@ TEST_F(ServerLogEntryTest, AddHostFields) {
       error;
 }
 
-TEST_F(ServerLogEntryTest, AddModeField1) {
-  scoped_ptr<ServerLogEntry> entry(
-      ServerLogEntry::MakeForSessionStateChange(true));
+TEST(ServerLogEntryHostTest, AddModeField1) {
+  scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true));
   entry->AddModeField(ServerLogEntry::IT2ME);
   scoped_ptr<XmlElement> stanza = entry->ToStanza();
   std::string error;
@@ -132,9 +83,8 @@ TEST_F(ServerLogEntryTest, AddModeField1) {
       error;
 }
 
-TEST_F(ServerLogEntryTest, AddModeField2) {
-  scoped_ptr<ServerLogEntry> entry(
-      ServerLogEntry::MakeForSessionStateChange(true));
+TEST(ServerLogEntryHostTest, AddModeField2) {
+  scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true));
   entry->AddModeField(ServerLogEntry::ME2ME);
   scoped_ptr<XmlElement> stanza = entry->ToStanza();
   std::string error;