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

chrome/test/live_sync/sessions_helper.cc

Index: chrome/test/live_sync/sessions_helper.cc
diff --git a/chrome/test/live_sync/sessions_helper.cc b/chrome/test/live_sync/sessions_helper.cc
index 24b578d93924baf3a6d45cddb0937e9c5a0bbf3b..f3c9447859aa1b46022668e3d4360115b4979613 100644
--- a/chrome/test/live_sync/sessions_helper.cc
+++ b/chrome/test/live_sync/sessions_helper.cc
@@ -23,14 +23,14 @@ using sync_datatype_helper::test;
 
 namespace sessions_helper {
 
-bool GetLocalSession(int index, const SyncedSession** session) {
+bool GetLocalSession(int index, const browser_sync::SyncedSession** session) {
   return test()->GetProfile(index)->GetProfileSyncService()->
       GetSessionModelAssociator()->GetLocalSession(session);
 }
 
 bool ModelAssociatorHasTabWithUrl(int index, const GURL& url) {
   ui_test_utils::RunAllPendingInMessageLoop();
-  const SyncedSession* local_session;
+  const browser_sync::SyncedSession* local_session;
   if (!GetLocalSession(index, &local_session)) {
     return false;
   }
@@ -119,7 +119,7 @@ bool WaitForTabsToLoad(int index, const std::vector<GURL>& urls) {
 bool GetLocalWindows(int index, SessionWindowVector& local_windows) {
   // The local session provided by GetLocalSession is owned, and has lifetime
   // controlled, by the model associator, so we must make our own copy.
-  const SyncedSession* local_session;
+  const browser_sync::SyncedSession* local_session;
   if (!GetLocalSession(index, &local_session)) {
     return false;
   }
@@ -161,7 +161,7 @@ bool CheckInitialState(int index) {
 }
 
 int GetNumWindows(int index) {
-  const SyncedSession* local_session;
+  const browser_sync::SyncedSession* local_session;
   if (!GetLocalSession(index, &local_session)) {
     return 0;
   }
@@ -204,7 +204,8 @@ void SortSessionWindows(SessionWindowVector& windows) {
             CompareSessionWindows);
 }
 
-bool CompareSyncedSessions(const SyncedSession* lhs, const SyncedSession* rhs) {
+bool CompareSyncedSessions(const browser_sync::SyncedSession* lhs,
+                           const browser_sync::SyncedSession* rhs) {
   if (!lhs ||
       !rhs ||
       lhs->windows.size() < 1 ||