Revert 99391 (broke CrOS unit_tests) - Set user-visible machine names and devices types for synce...

chrome/test/live_sync/performance/sessions_sync_perf_test.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 "base/stringprintf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/test/live_sync/performance/sync_timing_helper.h"
 #include "chrome/test/live_sync/live_sync_test.h"
 #include "chrome/test/live_sync/sessions_helper.h"
@@ skipping 54 matching lines @@
   }
   WaitForTabsToLoad(profile, urls);
 }
 
 void SessionsSyncPerfTest::RemoveTabs(int profile) {
   GetBrowser(profile)->CloseAllTabs();
 }
 
 int SessionsSyncPerfTest::GetTabCount(int profile) {
   int tab_count = 0;
-  const browser_sync::SyncedSession* local_session;
+  const SyncedSession* local_session;
   SyncedSessionVector sessions;
 
   if (!GetLocalSession(profile, &local_session)) {
     VLOG(1) << "GetLocalSession returned false";
     return -1;
   }
 
   if (!GetSessionData(profile, &sessions)) {
     // Foreign session data may be empty.  In this case we only count tabs in
     // the local session.
@@ skipping 36 matching lines @@
   ASSERT_EQ(kNumTabs, GetTabCount(1));
   SyncTimingHelper::PrintResult("tabs", "update_tabs", dt);
 
   RemoveTabs(0);
   dt = SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
   // New tab page remains open on profile 0 after closing all tabs.
   ASSERT_EQ(1, GetTabCount(0));
   ASSERT_EQ(0, GetTabCount(1));
   SyncTimingHelper::PrintResult("tabs", "delete_tabs", dt);
 }