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

chrome/browser/sync/profile_sync_factory_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_settings_backend.h"
+#include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/api/syncable_service.h"
 #include "chrome/browser/sync/glue/app_data_type_controller.h"
 #include "chrome/browser/sync/glue/autofill_change_processor.h"
 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"
 #include "chrome/browser/sync/glue/autofill_model_associator.h"
 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
 #include "chrome/browser/sync/glue/data_type_manager_impl.h"
 #include "chrome/browser/sync/glue/extension_data_type_controller.h"
 #include "chrome/browser/sync/glue/extension_setting_data_type_controller.h"
 #include "chrome/browser/sync/glue/generic_change_processor.h"
 #include "chrome/browser/sync/glue/password_change_processor.h"
 #include "chrome/browser/sync/glue/password_data_type_controller.h"
 #include "chrome/browser/sync/glue/password_model_associator.h"
 #include "chrome/browser/sync/glue/preference_data_type_controller.h"
 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h"
 #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"
 #include "chrome/browser/sync/glue/theme_data_type_controller.h"
 #include "chrome/browser/sync/glue/theme_model_associator.h"
 #include "chrome/browser/sync/glue/typed_url_change_processor.h"
 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
 #include "chrome/browser/sync/glue/typed_url_model_associator.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_factory_impl.h"
@@ skipping 20 matching lines @@
 using browser_sync::ExtensionSettingDataTypeController;
 using browser_sync::GenericChangeProcessor;
 using browser_sync::PasswordChangeProcessor;
 using browser_sync::PasswordDataTypeController;
 using browser_sync::PasswordModelAssociator;
 using browser_sync::PreferenceDataTypeController;
 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;
 using browser_sync::ThemeDataTypeController;
 using browser_sync::ThemeModelAssociator;
 using browser_sync::TypedUrlChangeProcessor;
 using browser_sync::TypedUrlDataTypeController;
 using browser_sync::TypedUrlModelAssociator;
 using browser_sync::UnrecoverableErrorHandler;
 
@@ skipping 94 matching lines @@
         new SearchEngineDataTypeController(this, profile_, pss));
   }
 }
 
 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager(
     SyncBackendHost* backend,
     const DataTypeController::TypeMap* controllers) {
   return new DataTypeManagerImpl(backend, controllers);
 }
 
+browser_sync::GenericChangeProcessor*
+    ProfileSyncFactoryImpl::CreateGenericChangeProcessor(
+        ProfileSyncService* profile_sync_service,
+        browser_sync::UnrecoverableErrorHandler* error_handler,
+        const base::WeakPtr<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();
+}
+
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateAppSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
-  SyncableService* app_sync_service =
-      profile_sync_service->profile()->GetExtensionService();
+  base::WeakPtr<SyncableService> app_sync_service =
+      profile_sync_service->profile()->GetExtensionService()->AsWeakPtr();
   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,
                                                change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateAutofillSyncComponents(
     ProfileSyncService* profile_sync_service,
     WebDatabase* web_database,
     browser_sync::UnrecoverableErrorHandler* error_handler) {
 
   AutofillModelAssociator* model_associator =
       new AutofillModelAssociator(profile_sync_service,
                                   web_database,
                                   profile_sync_service->profile());
   AutofillChangeProcessor* change_processor =
       new AutofillChangeProcessor(model_associator,
                                   web_database,
                                   profile_sync_service->profile(),
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }
 
-ProfileSyncFactory::SyncComponents
-ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents(
-    ProfileSyncService* profile_sync_service,
-    WebDataService* web_data_service,
-    browser_sync::UnrecoverableErrorHandler* error_handler) {
-  AutofillProfileSyncableService* sync_service =
-      new AutofillProfileSyncableService(web_data_service);
-  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);
+base::WeakPtr<SyncableService>
+ProfileSyncFactoryImpl::GetAutofillProfileSyncableService(
+    WebDataService* web_data_service) {
+  // TODO(isherman): This currently leaks at sync shutdown since the sync

[akalin, 2011/10/12 19:54:21]

rebase?

[Nicolas Zea, 2011/10/12 23:47:43]

Done.

+  // datatype controller doesn't own it. See crbug.com/96922.
+  return (new AutofillProfileSyncableService(web_data_service))->AsWeakPtr();
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateBookmarkSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
   BookmarkModel* bookmark_model =
       profile_sync_service->profile()->GetBookmarkModel();
   sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
   BookmarkModelAssociator* model_associator =
       new BookmarkModelAssociator(bookmark_model,
                                   user_share,
                                   error_handler);
   BookmarkChangeProcessor* change_processor =
       new BookmarkChangeProcessor(model_associator,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents(
     ExtensionSettingsBackend* extension_settings_backend,
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
   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->AsWeakPtr(),
+                                 user_share);
   browser_sync::SyncableServiceAdapter* sync_service_adapter =
       new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS,
                                                extension_settings_backend,
                                                change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateExtensionSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
-  SyncableService* extension_sync_service =
-      profile_sync_service->profile()->GetExtensionService();
+  base::WeakPtr<SyncableService> extension_sync_service =
+      profile_sync_service->profile()->GetExtensionService()->AsWeakPtr();
   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,
                                                change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreatePasswordSyncComponents(
     ProfileSyncService* profile_sync_service,
     PasswordStore* password_store,
     UnrecoverableErrorHandler* error_handler) {
   PasswordModelAssociator* model_associator =
       new PasswordModelAssociator(profile_sync_service,
                                   password_store);
   PasswordChangeProcessor* change_processor =
       new PasswordChangeProcessor(model_associator,
                                   password_store,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreatePreferenceSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
-  SyncableService* pref_sync_service =
-      profile_->GetPrefs()->GetSyncableService();
+  base::WeakPtr<SyncableService> pref_sync_service =
+      profile_->GetPrefs()->GetSyncableService()->AsWeakPtr();
   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,
                                  change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateThemeSyncComponents(
     ProfileSyncService* profile_sync_service,
@@ skipping 29 matching lines @@
       new SessionModelAssociator(profile_sync_service);
   SessionChangeProcessor* change_processor =
       new SessionChangeProcessor(error_handler, model_associator);
   return SyncComponents(model_associator, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateSearchEngineSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
-  SyncableService* se_sync_service =
-      TemplateURLServiceFactory::GetForProfile(profile_);
+  base::WeakPtr<SyncableService> se_sync_service =
+      TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr();
   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,
                                  change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }