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 bf2fab3a320c35c419b124b135619df2ba138f44..c24b3678ae2ec2c0a092cf54782afd688be0be36 100644 |
--- a/chrome/browser/sync/profile_sync_factory_impl.cc |
+++ b/chrome/browser/sync/profile_sync_factory_impl.cc |
@@ -30,6 +30,7 @@ |
#include "chrome/browser/sync/glue/session_change_processor.h" |
#include "chrome/browser/sync/glue/session_data_type_controller.h" |
#include "chrome/browser/sync/glue/session_model_associator.h" |
+#include "chrome/browser/sync/glue/shared_change_processor.h" |
#include "chrome/browser/sync/glue/syncable_service_adapter.h" |
#include "chrome/browser/sync/glue/sync_backend_host.h" |
#include "chrome/browser/sync/glue/theme_change_processor.h" |
@@ -69,6 +70,7 @@ using browser_sync::SearchEngineDataTypeController; |
using browser_sync::SessionChangeProcessor; |
using browser_sync::SessionDataTypeController; |
using browser_sync::SessionModelAssociator; |
+using browser_sync::SharedChangeProcessor; |
using browser_sync::SyncableServiceAdapter; |
using browser_sync::SyncBackendHost; |
using browser_sync::ThemeChangeProcessor; |
@@ -183,6 +185,21 @@ DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager( |
return new DataTypeManagerImpl(backend, controllers); |
} |
+browser_sync::GenericChangeProcessor* ProfileSyncFactoryImpl:: |
+ CreateGenericChangeProcessor( |
+ ProfileSyncService* profile_sync_service, |
+ browser_sync::UnrecoverableErrorHandler* error_handler, |
+ SyncableService *local_service) { |
+ sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
+ return new GenericChangeProcessor(error_handler, local_service, user_share); |
+} |
+ |
+browser_sync::SharedChangeProcessor* ProfileSyncFactoryImpl:: |
+ CreateSharedChangeProcessor( |
+ browser_sync::UnrecoverableErrorHandler* error_handler) { |
+ return new SharedChangeProcessor(error_handler); |
+} |
+ |
ProfileSyncFactory::SyncComponents |
ProfileSyncFactoryImpl::CreateAppSyncComponents( |
ProfileSyncService* profile_sync_service, |
@@ -191,7 +208,7 @@ ProfileSyncFactoryImpl::CreateAppSyncComponents( |
profile_sync_service->profile()->GetExtensionService(); |
sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
GenericChangeProcessor* change_processor = |
- new GenericChangeProcessor(app_sync_service, error_handler, user_share); |
+ new GenericChangeProcessor(error_handler, app_sync_service, user_share); |
browser_sync::SyncableServiceAdapter* sync_service_adapter = |
new browser_sync::SyncableServiceAdapter(syncable::APPS, |
app_sync_service, |
@@ -217,22 +234,14 @@ ProfileSyncFactoryImpl::CreateAutofillSyncComponents( |
return SyncComponents(model_associator, change_processor); |
} |
-ProfileSyncFactory::SyncComponents |
+SyncableService* |
ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents( |
ProfileSyncService* profile_sync_service, |
- WebDatabase* web_database, |
- browser_sync::UnrecoverableErrorHandler* error_handler) { |
+ WebDatabase* web_database) { |
AutofillProfileSyncableService* sync_service = |
new AutofillProfileSyncableService(web_database, |
profile_sync_service->profile()); |
- sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
- GenericChangeProcessor* change_processor = |
- new GenericChangeProcessor(sync_service, error_handler, user_share); |
- browser_sync::SyncableServiceAdapter* sync_service_adapter = |
- new browser_sync::SyncableServiceAdapter(syncable::AUTOFILL_PROFILE, |
- sync_service, |
- change_processor); |
- return SyncComponents(sync_service_adapter, change_processor); |
+ return sync_service; |
} |
ProfileSyncFactory::SyncComponents |
@@ -260,10 +269,9 @@ ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents( |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
GenericChangeProcessor* change_processor = |
- new GenericChangeProcessor( |
- extension_settings_backend, |
- error_handler, |
- user_share); |
+ new GenericChangeProcessor(error_handler, |
+ extension_settings_backend, |
+ user_share); |
browser_sync::SyncableServiceAdapter* sync_service_adapter = |
new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS, |
extension_settings_backend, |
@@ -279,8 +287,8 @@ ProfileSyncFactoryImpl::CreateExtensionSyncComponents( |
profile_sync_service->profile()->GetExtensionService(); |
sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
GenericChangeProcessor* change_processor = |
- new GenericChangeProcessor(extension_sync_service, error_handler, |
- user_share); |
+ new GenericChangeProcessor(error_handler, extension_sync_service, |
+ user_share); |
browser_sync::SyncableServiceAdapter* sync_service_adapter = |
new browser_sync::SyncableServiceAdapter(syncable::EXTENSIONS, |
extension_sync_service, |
@@ -311,7 +319,7 @@ ProfileSyncFactoryImpl::CreatePreferenceSyncComponents( |
profile_->GetPrefs()->GetSyncableService(); |
sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
GenericChangeProcessor* change_processor = |
- new GenericChangeProcessor(pref_sync_service, error_handler, user_share); |
+ new GenericChangeProcessor(error_handler, pref_sync_service, user_share); |
SyncableServiceAdapter* sync_service_adapter = |
new SyncableServiceAdapter(syncable::PREFERENCES, |
pref_sync_service, |
@@ -366,7 +374,7 @@ ProfileSyncFactoryImpl::CreateSearchEngineSyncComponents( |
DCHECK(se_sync_service); |
sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
GenericChangeProcessor* change_processor = |
- new GenericChangeProcessor(se_sync_service, error_handler, user_share); |
+ new GenericChangeProcessor(error_handler, se_sync_service, user_share); |
SyncableServiceAdapter* sync_service_adapter = |
new SyncableServiceAdapter(syncable::SEARCH_ENGINES, |
se_sync_service, |