NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

chrome/browser/sync/profile_sync_service_session_unittest.cc

Index: chrome/browser/sync/profile_sync_service_session_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index 33790cfb5dc43e8ef729dbb2de0fb374e94c3492..e61158ad07f159a10db2f76bf4fe0504fe935ed5 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -41,11 +41,11 @@
 #include "sync/internal_api/public/change_record.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
+#include "sync/internal_api/public/test/test_user_share.h"
 #include "sync/internal_api/public/write_node.h"
 #include "sync/internal_api/public/write_transaction.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
-#include "sync/test/engine/test_id_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_types.h"
@@ -58,7 +58,6 @@ using content::BrowserThread;
 using syncer::ChangeRecord;
 using testing::_;
 using testing::Return;
-using syncer::TestIdFactory;
 
 namespace browser_sync {
 
@@ -68,7 +67,7 @@ void BuildSessionSpecifics(const std::string& tag,
                            sync_pb::SessionSpecifics* meta) {
   meta->set_session_tag(tag);
   sync_pb::SessionHeader* header = meta->mutable_header();
-  header->set_device_type(sync_pb::SessionHeader_DeviceType_TYPE_LINUX);
+  header->set_device_type(sync_pb::SyncEnums_DeviceType_TYPE_LINUX);
   header->set_client_name("name");
 }
 
@@ -87,7 +86,7 @@ void AddWindowSpecifics(int window_id,
 }
 
 void BuildTabSpecifics(const std::string& tag, int window_id, int tab_id,
-                     sync_pb::SessionSpecifics* tab_base) {
+                       sync_pb::SessionSpecifics* tab_base) {
   tab_base->set_session_tag(tag);
   sync_pb::SessionTab* tab = tab_base->mutable_tab();
   tab->set_tab_id(tab_id);
@@ -160,8 +159,6 @@ class ProfileSyncServiceSessionTest
         notified_of_refresh_(false) {}
   ProfileSyncService* sync_service() { return sync_service_.get(); }
 
-  TestIdFactory* ids() { return sync_service_->id_factory(); }
-
  protected:
   virtual TestingProfile* CreateProfile() OVERRIDE {
     TestingProfile* profile = new TestingProfile();
@@ -287,8 +284,8 @@ class CreateRootHelper {
 
  private:
   void CreateRootCallback(ProfileSyncServiceSessionTest* test) {
-    success_ = ProfileSyncServiceTestHelper::CreateRoot(
-        syncer::SESSIONS, test->sync_service()->GetUserShare(), test->ids());
+    success_ = syncer::TestUserShare::CreateRoot(
+        syncer::SESSIONS, test->sync_service()->GetUserShare());
   }
 
   base::Closure callback_;