[Sync] Refactor non-frontend DTC to handle new API properly.

chrome/browser/sync/profile_sync_factory_impl.cc

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..ed2f3a93ec12849aaaf5b1a9f67e360c4a428ba5 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,20 @@ DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager(
   return new DataTypeManagerImpl(backend, controllers);
 }
 
+browser_sync::GenericChangeProcessor* ProfileSyncFactoryImpl::
+    CreateGenericChangeProcessor(
+        ProfileSyncService* profile_sync_service,
+        browser_sync::UnrecoverableErrorHandler* error_handler,

[akalin, 2011/10/11 22:41:08]

is this necessary?  I think what calls this already has access to PSS, so it can
create the GCP directly

[Nicolas Zea, 2011/10/12 04:24:19]

It's useful for mocking. But yes, I've changed SharedChangeProcessor to make
it's own generic change processor (via this method). Eventually once I
transition the frontend datatypes over to stop using SyncableServiceAdapter this
will be used for them too, and will become useful for their unit tests.

+        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() {
+  return new SharedChangeProcessor();

[akalin, 2011/10/11 22:41:08]

here, too.  Is this necessary?  caller can just create the SCP themselves.

[Nicolas Zea, 2011/10/12 04:24:19]

Primarily useful for mocking/testing.

+}
+
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateAppSyncComponents(
     ProfileSyncService* profile_sync_service,
@@ -191,7 +207,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 +233,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 +268,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 +286,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 +318,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 +373,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,