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

chrome/browser/sync/glue/session_model_associator.h

Index: chrome/browser/sync/glue/session_model_associator.h
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index 957914077c88c591cc34f5e7f4e8b9d79e3008e5..6be9b6d989a554a6fa1937d861ae125c68bd7e97 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -191,8 +191,11 @@ class SessionModelAssociator
                            WriteForeignSessionToNode);
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolEmpty);
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty);
+  FRIEND_TEST_ALL_PREFIXES(SessionModelAssociatorTest, PopulateSessionHeader);
   FRIEND_TEST_ALL_PREFIXES(SessionModelAssociatorTest, PopulateSessionWindow);
   FRIEND_TEST_ALL_PREFIXES(SessionModelAssociatorTest, PopulateSessionTab);
+  FRIEND_TEST_ALL_PREFIXES(SessionModelAssociatorTest,
+                           InitializeCurrentMachineName);
 
   // Keep all the links to local tab data in one place.
   class TabLinks {
@@ -321,6 +324,9 @@ class SessionModelAssociator
   // Initializes the tag corresponding to this machine.
   void InitializeCurrentMachineTag(sync_api::WriteTransaction* trans);
 
+  // Initializes the user visible name for this machine
+  static void InitializeCurrentMachineName();
+
   // Updates the server data based upon the current client session.  If no node
   // corresponding to this machine exists in the sync model, one is created.
   void UpdateSyncModelDataFromClient();
@@ -338,6 +344,12 @@ class SessionModelAssociator
                                    const int64 sync_id,
                                    sync_api::WriteTransaction* trans);
 
+  // Used to populate a session header from the session specifics header
+  // provided.
+  static void PopulateSessionHeaderFromSpecifics(
+    const sync_pb::SessionHeader& header_specifics,
+    SyncedSession* session_header);
+
   // Used to populate a session window from the session specifics window
   // provided. Tracks any foreign session data created through |tracker|.
   static void PopulateSessionWindowFromSpecifics(
@@ -395,9 +407,12 @@ class SessionModelAssociator
   // For testing only.
   void QuitLoopForTest();
 
-  // Local client name.
+  // Unique client tag.
   std::string current_machine_tag_;
 
+  // User-visible machine name.
+  static std::string current_machine_name_;
+
   // Pool of all used/available sync nodes associated with tabs.
   TabNodePool tab_pool_;