| Index: components/browser_sync/profile_sync_components_factory_impl.cc
|
| diff --git a/components/browser_sync/profile_sync_components_factory_impl.cc b/components/browser_sync/profile_sync_components_factory_impl.cc
|
| index c5f9a8ddbeb740cb86edf62c20b02932424e4c2c..445b20bb22190e9c2491a0a43d6632f934df8e7b 100644
|
| --- a/components/browser_sync/profile_sync_components_factory_impl.cc
|
| +++ b/components/browser_sync/profile_sync_components_factory_impl.cc
|
| @@ -209,9 +209,14 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
|
| // TypedUrl sync is enabled by default. Register unless explicitly disabled,
|
| // or if saving history is disabled.
|
| if (!disabled_types.Has(syncer::TYPED_URLS) && !history_disabled) {
|
| - sync_service->RegisterDataTypeController(
|
| - base::MakeUnique<TypedUrlDataTypeController>(
|
| - error_callback, sync_client_, history_disabled_pref_));
|
| + if (base::FeatureList::IsEnabled(switches::kSyncUSSTypedURL)) {
|
| + // TODO(gangwu): Register controller here once typed url controller
|
| + // implemented.
|
| + } else {
|
| + sync_service->RegisterDataTypeController(
|
| + base::MakeUnique<TypedUrlDataTypeController>(
|
| + error_callback, sync_client_, history_disabled_pref_));
|
| + }
|
| }
|
|
|
| // Delete directive sync is enabled by default. Register unless full history
|
|
|