Set user-visible machine names and devices types for synced sessions.

chrome/browser/sync/glue/session_model_associator_unittest.cc

Index: chrome/browser/sync/glue/session_model_associator_unittest.cc
diff --git a/chrome/browser/sync/glue/session_model_associator_unittest.cc b/chrome/browser/sync/glue/session_model_associator_unittest.cc
index b6c5986f4829beeea5db4c4f61d47d404def6e6f..41dbf1814060dd3b037464e2d145a19d059f11a7 100644
--- a/chrome/browser/sync/glue/session_model_associator_unittest.cc
+++ b/chrome/browser/sync/glue/session_model_associator_unittest.cc
@@ -51,6 +51,18 @@ TEST_F(SessionModelAssociatorTest, IsValidSessionTab) {
   ASSERT_TRUE(SessionModelAssociator::IsValidSessionTab(tab));
 }
 
+TEST_F(SessionModelAssociatorTest, PopulateSessionHeader) {
+  sync_pb::SessionHeader header_s;
+  header_s.set_client_name("Client 1");
+  header_s.set_device_type(sync_pb::SessionHeader_DeviceType_TYPE_WIN);
+
+  SyncedSession session;
+  SessionModelAssociator::PopulateSessionHeaderFromSpecifics(
+      header_s, &session);
+  ASSERT_EQ("Client 1", session.client_name);
+  ASSERT_EQ(SyncedSession::TYPE_WIN, session.device_type);
+}
+
 TEST_F(SessionModelAssociatorTest, PopulateSessionWindow) {
   sync_pb::SessionWindow window_s;
   window_s.add_tab(0);
@@ -158,5 +170,10 @@ TEST_F(SessionModelAssociatorTest, SyncedSessionTracker) {
   ASSERT_EQ(0U, tracker.num_synced_sessions());
 }
 
-}  // namespace browser_sync
+TEST_F(SessionModelAssociatorTest, InitializeCurrentMachineName) {
+  SessionModelAssociator::InitializeCurrentMachineName();
+  ASSERT_TRUE(SessionModelAssociator::current_machine_name_.length() > 0);
+}
+
 
+}  // namespace browser_sync