NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

chrome/browser/sync/glue/session_model_associator_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/sessions/session_types.h"
@@ skipping 111 matching lines @@
                     string16(ASCIIToUTF16("title")),
                     std::string("state"), content::PageTransitionFromInt(0));
   tab.navigations.push_back(nav);
   // NewTab does not count as valid if it's the only navigation.
   ASSERT_FALSE(ShouldSyncSessionTab(tab));
 }
 
 TEST_F(SyncSessionModelAssociatorTest, PopulateSessionHeader) {
   sync_pb::SessionHeader header_s;
   header_s.set_client_name("Client 1");
-  header_s.set_device_type(sync_pb::SessionHeader_DeviceType_TYPE_WIN);
+  header_s.set_device_type(sync_pb::SyncEnums_DeviceType_TYPE_WIN);
 
   SyncedSession session;
   base::Time time = base::Time::Now();
   SessionModelAssociator::PopulateSessionHeaderFromSpecifics(
       header_s, time, &session);
   ASSERT_EQ("Client 1", session.session_name);
   ASSERT_EQ(SyncedSession::TYPE_WIN, session.device_type);
   ASSERT_EQ(time, session.modified_time);
 }
 
@@ skipping 688 matching lines @@
             sync_tab.navigation(2).virtual_url());
   EXPECT_EQ(1, sync_tab.current_navigation_index());
   EXPECT_EQ(2, sync_tab.navigation(0).timestamp());
   EXPECT_LE(now, sync_tab.navigation(1).timestamp());
   EXPECT_LE(now, sync_tab.navigation(2).timestamp());
   EXPECT_EQ(3U, prev_tab.navigations.size());
   EXPECT_EQ(3U, prev_tab.synced_tab_navigations.size());
 }
 
 }  // namespace browser_sync