| Index: components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| diff --git a/components/browser_sync/browser/profile_sync_components_factory_impl.cc b/components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| index a96b1ee316a87c30d338d15631f9a877aa4d3bb8..72377abcbe10497018bb6841e1f6da0bfa9806d6 100644
|
| --- a/components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| +++ b/components/browser_sync/browser/profile_sync_components_factory_impl.cc
|
| @@ -261,9 +261,15 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
|
|
|
| if (!disabled_types.Has(syncer::PREFERENCES) &&
|
| base::FeatureList::IsEnabled(kSyncPreferencesFeature)) {
|
| - sync_service->RegisterDataTypeController(
|
| - base::MakeUnique<UIDataTypeController>(syncer::PREFERENCES,
|
| - error_callback, sync_client_));
|
| + if (!override_prefs_controller_to_uss_for_test_) {
|
| + sync_service->RegisterDataTypeController(
|
| + base::MakeUnique<UIDataTypeController>(syncer::PREFERENCES,
|
| + error_callback, sync_client_));
|
| + } else {
|
| + sync_service->RegisterDataTypeController(
|
| + base::MakeUnique<UIModelTypeController>(
|
| + syncer::PREFERENCES, error_callback, sync_client_));
|
| + }
|
| }
|
|
|
| if (!disabled_types.Has(syncer::PRIORITY_PREFERENCES)) {
|
| @@ -413,3 +419,11 @@ ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents(
|
| model_associator, std::move(error_handler));
|
| return SyncComponents(model_associator, change_processor);
|
| }
|
| +
|
| +// static
|
| +void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) {
|
| + override_prefs_controller_to_uss_for_test_ = use_uss;
|
| +}
|
| +
|
| +bool ProfileSyncComponentsFactoryImpl::
|
| + override_prefs_controller_to_uss_for_test_ = false;
|
|
|