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

chrome/browser/sync/glue/session_model_associator_unittest.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/sessions/session_types.h"
@@ skipping 33 matching lines @@
   ASSERT_FALSE(SessionModelAssociator::IsValidSessionTab(tab));
   TabNavigation nav2(0, GURL("about:bubba"),
                     GURL("about:referrer"),
                     string16(ASCIIToUTF16("title")),
                     std::string("state"), 0U);
   tab.navigations.push_back(nav2);
   // Once there's another navigation, the tab is valid.
   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);
   window_s.set_browser_type(sync_pb::SessionWindow_BrowserType_TYPE_TABBED);
   window_s.set_selected_tab_index(1);
 
   std::string tag = "tag";
   SyncedSessionTracker tracker;
   SyncedSession* session = tracker.GetSession(tag);
   SessionWindow* win = new SessionWindow();
@@ skipping 87 matching lines @@
   // The sessions don't have valid windows, lookup should not succeed.
   std::vector<const SyncedSession*> sessions;
   ASSERT_FALSE(tracker.LookupAllForeignSessions(&sessions));
 
   tracker.clear();
   ASSERT_EQ(0U, tracker.num_synced_tabs(tag1));
   ASSERT_EQ(0U, tracker.num_synced_tabs(tag2));
   ASSERT_EQ(0U, tracker.num_synced_sessions());
 }
 
+TEST_F(SessionModelAssociatorTest, InitializeCurrentMachineName) {
+  SessionModelAssociator::InitializeCurrentMachineName();
+  ASSERT_TRUE(SessionModelAssociator::current_machine_name_.length() > 0);
+}
+
+
 }  // namespace browser_sync
-