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

chrome/test/live_sync/sessions_helper.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 "chrome/test/live_sync/sessions_helper.h"
 
 #include "base/stl_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/live_sync/sync_datatype_helper.h"
 #include "chrome/test/live_sync/live_sync_test.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "googleurl/src/gurl.h"
 
 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;
   }
 
   if (local_session->windows.size() == 0) {
     VLOG(1) << "Empty windows vector";
     return false;
   }
 
   int nav_index;
@@ skipping 68 matching lines @@
         ui_test_utils::RunMessageLoop();
       }
     }
   }
   return true;
 }
 
 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;
   }
   for (size_t w = 0; w < local_session->windows.size(); ++w) {
     const SessionWindow& window = *local_session->windows.at(w);
     SessionWindow* new_window = new SessionWindow();
     for (size_t t = 0; t < window.tabs.size(); ++t) {
       const SessionTab& tab = *window.tabs.at(t);
       SessionTab* new_tab = new SessionTab();
       new_tab->navigations.resize(tab.navigations.size());
@@ skipping 21 matching lines @@
 
 bool CheckInitialState(int index) {
   if (0 != GetNumWindows(index))
     return false;
   if (0 != GetNumForeignSessions(index))
     return false;
   return true;
 }
 
 int GetNumWindows(int index) {
-  const SyncedSession* local_session;
+  const browser_sync::SyncedSession* local_session;
   if (!GetLocalSession(index, &local_session)) {
     return 0;
   }
   return local_session->windows.size();
 }
 
 int GetNumForeignSessions(int index) {
   SyncedSessionVector sessions;
   if (!test()->GetProfile(index)->GetProfileSyncService()->
           GetSessionModelAssociator()->GetAllForeignSessions(&sessions))
@@ skipping 22 matching lines @@
 
   return lhs->tabs[0]->navigations[0].virtual_url() <
       rhs->tabs[0]->navigations[0].virtual_url();
 }
 
 void SortSessionWindows(SessionWindowVector& windows) {
   std::sort(windows.begin(), windows.end(),
             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 ||
       rhs->windows.size() < 1) {
     // Catchall for uncomparable data.
     return false;
   }
 
   return CompareSessionWindows(lhs->windows[0], rhs->windows[0]);
 }
@@ skipping 66 matching lines @@
     if (window_index == index)
       window_index++;  // Skip self.
     if (!WindowsMatch(sessions[j]->windows, *windows[window_index]))
       return false;
   }
 
   return true;
 }
 
 }  // namespace sessions_helper