[Sync] Add CoreTypes support

chrome/browser/sync/glue/data_type_manager_impl.cc

Index: chrome/browser/sync/glue/data_type_manager_impl.cc
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc
index 87daedb47c9aa997169c3e5f450d340c310f5da9..2f86ae5ebe9aad9a93709413b74271d0da96ba08 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -77,10 +77,7 @@ DataTypeManagerImpl::~DataTypeManagerImpl() {}
 
 void DataTypeManagerImpl::Configure(syncer::ModelTypeSet desired_types,
                                     syncer::ConfigureReason reason) {
-  desired_types.PutAll(syncer::ControlTypes());
-  // The list of managed users created by this profile is always synced,
-  // but they are not a control type.
-  desired_types.Put(syncer::MANAGED_USERS);
+  desired_types.PutAll(syncer::CoreTypes());
   ConfigureImpl(desired_types, reason);
 }
 
@@ -242,7 +239,7 @@ void DataTypeManagerImpl::Restart(syncer::ConfigureReason reason) {
 
 syncer::ModelTypeSet DataTypeManagerImpl::GetPriorityTypes() const {
   syncer::ModelTypeSet high_priority_types;
-  high_priority_types.PutAll(syncer::ControlTypes());
+  high_priority_types.PutAll(syncer::PriorityCoreTypes());
   high_priority_types.PutAll(syncer::PriorityUserTypes());
   return high_priority_types;
 }