Refactor syncable DEVICE_INFO type from ChangeProcessor to SyncableService - part 3.

sync/syncable/model_type.cc

Index: sync/syncable/model_type.cc
diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc
index 99ef39d8c01df50be4cd2e4947df523cc7027f5d..59be6f2de881fca8262d026febacd9ecc03dae3e 100644
--- a/sync/syncable/model_type.cc
+++ b/sync/syncable/model_type.cc
@@ -373,6 +373,9 @@ ModelTypeSet EncryptableUserTypes() {
   // Synced Notification App Info does not have private data, so it is not
   // encrypted.
   encryptable_user_types.Remove(SYNCED_NOTIFICATION_APP_INFO);
+  // Device info data is not encrypted because it might be synced before
+  // encryption is ready.
+  encryptable_user_types.Remove(DEVICE_INFO);
   // Priority preferences are not encrypted because they might be synced before
   // encryption is ready.
   encryptable_user_types.Remove(PRIORITY_PREFERENCES);
@@ -391,7 +394,7 @@ ModelTypeSet EncryptableUserTypes() {
 }
 
 ModelTypeSet PriorityUserTypes() {
-  return ModelTypeSet(PRIORITY_PREFERENCES);
+  return ModelTypeSet(DEVICE_INFO, PRIORITY_PREFERENCES);
 }
 
 ModelTypeSet ControlTypes() {