| 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 3c14d48d94c3985167a9b5cf1eb29e31ba081767..391ccd4cb82f8387ef025cdf4bebf7f2b29ad325 100644
|
| --- a/chrome/browser/sync/glue/data_type_manager_impl.cc
|
| +++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
|
| @@ -77,7 +77,10 @@ DataTypeManagerImpl::~DataTypeManagerImpl() {}
|
|
|
| void DataTypeManagerImpl::Configure(syncer::ModelTypeSet desired_types,
|
| syncer::ConfigureReason reason) {
|
| - desired_types.PutAll(syncer::CoreTypes());
|
| + if (reason == syncer::CONFIGURE_REASON_BACKUP_ROLLBACK)
|
| + desired_types.PutAll(syncer::ControlTypes());
|
| + else
|
| + desired_types.PutAll(syncer::CoreTypes());
|
|
|
| // Only allow control types and types that have controllers.
|
| syncer::ModelTypeSet filtered_desired_types;
|
|
|