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

chrome/browser/sync/glue/session_model_associator_unittest.cc

Index: chrome/browser/sync/glue/session_model_associator_unittest.cc
===================================================================
--- chrome/browser/sync/glue/session_model_associator_unittest.cc	(revision 99393)
+++ chrome/browser/sync/glue/session_model_associator_unittest.cc	(working copy)
@@ -15,7 +15,6 @@
 
 using browser_sync::SessionModelAssociator;
 using browser_sync::SyncedSessionTracker;
-
 namespace browser_sync {
 
 typedef testing::Test SessionModelAssociatorTest;
@@ -52,18 +51,6 @@
   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.session_name);
-  ASSERT_EQ(SyncedSession::TYPE_WIN, session.device_type);
-}
-
 TEST_F(SessionModelAssociatorTest, PopulateSessionWindow) {
   sync_pb::SessionWindow window_s;
   window_s.add_tab(0);
@@ -171,22 +158,5 @@
   ASSERT_EQ(0U, tracker.num_synced_sessions());
 }
 
-#if defined(OS_WIN)
-// The test is somewhat silly, and just verifies that we return a computer name.
-TEST(SessionModelAssociatorTest, TestGetComputerName) {
-  std::string computer_name = SessionModelAssociator::GetComputerName();
-  EXPECT_TRUE(!computer_name.empty());
-}
-#endif
-
-#if defined(OS_MACOSX)
-// The test is somewhat silly, and just verifies that we return a hardware
-// model name.
-TEST_F(SessionModelAssociatorTest, GetHardwareModelName) {
-  std::string hardware_model = SessionModelAssociator::GetHardwareModelName();
-  EXPECT_TRUE(!hardware_model.empty());
-}
-#endif
-
-
 }  // namespace browser_sync
+