| Index: chrome/browser/sync/profile_sync_factory_impl.cc
|
| diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc
|
| index 430941c93424b01963fdb956f45a9646b7bd7961..64618f254b1f255781121d66e5e975e5fd8373b3 100644
|
| --- a/chrome/browser/sync/profile_sync_factory_impl.cc
|
| +++ b/chrome/browser/sync/profile_sync_factory_impl.cc
|
| @@ -87,7 +87,10 @@ ProfileSyncService* ProfileSyncFactoryImpl::CreateProfileSyncService(
|
|
|
| ProfileSyncService* pss = new ProfileSyncService(
|
| this, profile_, cros_user);
|
| + return pss;
|
| +}
|
|
|
| +void ProfileSyncFactoryImpl::RegisterDataTypes(ProfileSyncService* pss) {
|
| // App sync is enabled by default. Register unless explicitly
|
| // disabled.
|
| if (!command_line_->HasSwitch(switches::kDisableSyncApps)) {
|
| @@ -99,7 +102,7 @@ ProfileSyncService* ProfileSyncFactoryImpl::CreateProfileSyncService(
|
| // disabled.
|
| if (!command_line_->HasSwitch(switches::kDisableSyncAutofill)) {
|
| pss->RegisterDataTypeController(
|
| - new AutofillDataTypeController(this, profile_, pss));
|
| + new AutofillDataTypeController(this, profile_));
|
| }
|
|
|
| // Bookmark sync is enabled by default. Register unless explicitly
|
| @@ -120,7 +123,7 @@ ProfileSyncService* ProfileSyncFactoryImpl::CreateProfileSyncService(
|
| // disabled.
|
| if (!command_line_->HasSwitch(switches::kDisableSyncPasswords)) {
|
| pss->RegisterDataTypeController(
|
| - new PasswordDataTypeController(this, profile_, pss));
|
| + new PasswordDataTypeController(this, profile_));
|
| }
|
|
|
| // Preference sync is enabled by default. Register unless explicitly
|
| @@ -140,7 +143,7 @@ ProfileSyncService* ProfileSyncFactoryImpl::CreateProfileSyncService(
|
| // explicitly enabled.
|
| if (command_line_->HasSwitch(switches::kEnableSyncTypedUrls)) {
|
| pss->RegisterDataTypeController(
|
| - new TypedUrlDataTypeController(this, profile_, pss));
|
| + new TypedUrlDataTypeController(this, profile_));
|
| }
|
|
|
| // Session sync is disabled by default. Register only if explicitly
|
| @@ -151,10 +154,9 @@ ProfileSyncService* ProfileSyncFactoryImpl::CreateProfileSyncService(
|
| }
|
|
|
| if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) {
|
| - pss->RegisterDataTypeController(new AutofillProfileDataTypeController(
|
| - this, profile_, pss));
|
| + pss->RegisterDataTypeController(
|
| + new AutofillProfileDataTypeController(this, profile_));
|
| }
|
| - return pss;
|
| }
|
|
|
| DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager(
|
|
|