NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

chrome/browser/sync/test_profile_sync_service.cc

Index: chrome/browser/sync/test_profile_sync_service.cc
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index c27241769e0e0b66b4e260b4e5441a989b8aa182..5c7d53b9f700aca3e9a3c6158f035ac7eb2ab71e 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -25,6 +25,8 @@ using syncer::sessions::SyncSessionSnapshot;
 using syncer::sessions::SyncSourceInfo;
 using syncer::UserShare;
 using syncer::syncable::Directory;
+using syncer::NIGORI;
+using syncer::DEVICE_INFO;
 
 namespace browser_sync {
 
@@ -118,14 +120,17 @@ void SyncBackendHostForProfileSyncTest
       UserShare* user_share = GetUserShare();
       Directory* directory = user_share->directory.get();
 
-      if (!directory->initial_sync_ended_for_type(syncer::NIGORI)) {
-        ProfileSyncServiceTestHelper::CreateRoot(
-            syncer::NIGORI, user_share, &id_factory_);
+      if (!directory->initial_sync_ended_for_type(NIGORI)) {
+        ProfileSyncServiceTestHelper::CreateRoot(NIGORI, user_share);
 
         // A side effect of adding the NIGORI mode (normally done by the
         // syncer) is a decryption attempt, which will fail the first time.
       }
 
+      if (!directory->initial_sync_ended_for_type(DEVICE_INFO)) {
+        ProfileSyncServiceTestHelper::CreateRoot(DEVICE_INFO, user_share);
+      }
+
       SetInitialSyncEndedForAllTypes();
       restored_types = syncer::ModelTypeSet::All();
     }