[Sync] Remove SyncableServiceAdapter.

chrome/browser/sync/profile_sync_components_factory_impl.cc

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 30d99ff46e81ec2e7524ac384bf656e5d55ab1d3..0a6ae7c742d4812a27065a6eeddce075c6974e6f 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -23,17 +23,16 @@
 #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/generic_ui_data_type_controller.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/sync_backend_host.h"
-#include "chrome/browser/sync/glue/syncable_service_adapter.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"
@@ -61,16 +60,15 @@ using browser_sync::DataTypeManagerImpl;
 using browser_sync::ExtensionDataTypeController;
 using browser_sync::ExtensionSettingDataTypeController;
 using browser_sync::GenericChangeProcessor;
+using browser_sync::GenericUIDataTypeController;
 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;
@@ -129,7 +127,8 @@ void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncPreferences)) {
     pss->RegisterDataTypeController(
-        new PreferenceDataTypeController(this, profile_, pss));
+        new GenericUIDataTypeController(syncable::PREFERENCES, this, profile_,
+                                        pss));
   }
 
   // Theme sync is enabled by default.  Register unless explicitly disabled.
@@ -212,38 +211,44 @@ base::WeakPtr<SyncableService> ProfileSyncComponentsFactoryImpl::
      return base::WeakPtr<SyncableService>();
   }
   switch (type) {
-    case syncable::AUTOFILL: {
-      WebDataService* wds =
-          profile_->GetWebDataService(Profile::IMPLICIT_ACCESS);
-      if (!wds)
-        return base::WeakPtr<SyncableService>();
-      return GetAutocompleteSyncableService(wds);
-    }
+    case syncable::PREFERENCES:
+      return profile_->GetPrefs()->GetSyncableService()->AsWeakPtr();
+    case syncable::AUTOFILL:
     case syncable::AUTOFILL_PROFILE: {
       WebDataService* wds =
           profile_->GetWebDataService(Profile::IMPLICIT_ACCESS);
       if (!wds)
         return base::WeakPtr<SyncableService>();
-      return GetAutofillProfileSyncableService(wds);
+      if (type == syncable::AUTOFILL)
+        return wds->GetAutocompleteSyncableService()->AsWeakPtr();
+      else
+        return wds->GetAutofillProfileSyncableService()->AsWeakPtr();
     }
+    case syncable::APPS:
+    case syncable::EXTENSIONS:
+      return profile_->GetExtensionService()->AsWeakPtr();
+    case syncable::SEARCH_ENGINES:
+      return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr();
+    case syncable::APP_SETTINGS:
+    case syncable::EXTENSION_SETTINGS:
+      return profile_->GetExtensionService()->settings_frontend()->
+          GetBackendForSync(type)->AsWeakPtr();
+    case syncable::APP_NOTIFICATIONS:
+      return profile_->GetExtensionService()->app_notification_manager()->
+          AsWeakPtr();
     default:
+      // The following datatypes still need to be transitioned to the
+      // SyncableService API:
+      // Bookmarks
+      // Passwords
+      // Sessions
+      // Themes
+      // Typed URLs
       NOTREACHED();
       return base::WeakPtr<SyncableService>();
   }
 }
 
-base::WeakPtr<SyncableService>
-    ProfileSyncComponentsFactoryImpl::GetAutofillProfileSyncableService(
-        WebDataService* web_data_service) const {
-  return web_data_service->GetAutofillProfileSyncableService()->AsWeakPtr();
-}
-
-base::WeakPtr<SyncableService>
-    ProfileSyncComponentsFactoryImpl::GetAutocompleteSyncableService(
-        WebDataService* web_data_service) const {
-  return web_data_service->GetAutocompleteSyncableService()->AsWeakPtr();
-}
-
 ProfileSyncComponentsFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents(
         ProfileSyncService* profile_sync_service,
@@ -262,47 +267,6 @@ ProfileSyncComponentsFactory::SyncComponents
 }
 
 ProfileSyncComponentsFactory::SyncComponents
-    ProfileSyncComponentsFactoryImpl::CreateExtensionOrAppSettingSyncComponents(
-        syncable::ModelType type,
-        ProfileSyncService* profile_sync_service,
-        UnrecoverableErrorHandler* error_handler) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  DCHECK(type == syncable::EXTENSION_SETTINGS ||
-         type == syncable::APP_SETTINGS);
-  SyncableService* settings_service = profile_->GetExtensionService()->
-      settings_frontend()->GetBackendForSync(type);
-  sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
-  GenericChangeProcessor* change_processor =
-      new GenericChangeProcessor(error_handler,
-                                 settings_service->AsWeakPtr(),
-                                 user_share);
-  browser_sync::SyncableServiceAdapter* sync_service_adapter =
-      new browser_sync::SyncableServiceAdapter(type,
-                                               settings_service,
-                                               change_processor);
-  return SyncComponents(sync_service_adapter, change_processor);
-}
-
-ProfileSyncComponentsFactory::SyncComponents
-    ProfileSyncComponentsFactoryImpl::CreateExtensionOrAppSyncComponents(
-        syncable::ModelType type,
-        ProfileSyncService* profile_sync_service,
-        UnrecoverableErrorHandler* error_handler) {
-  base::WeakPtr<SyncableService> sync_service =
-      profile_sync_service->profile()->GetExtensionService()->AsWeakPtr();
-  sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
-  GenericChangeProcessor* change_processor =
-      new GenericChangeProcessor(error_handler,
-                                 sync_service,
-                                 user_share);
-  browser_sync::SyncableServiceAdapter* sync_service_adapter =
-      new browser_sync::SyncableServiceAdapter(type,
-                                               sync_service,
-                                               change_processor);
-  return SyncComponents(sync_service_adapter, change_processor);
-}
-
-ProfileSyncComponentsFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreatePasswordSyncComponents(
         ProfileSyncService* profile_sync_service,
         PasswordStore* password_store,
@@ -318,24 +282,6 @@ ProfileSyncComponentsFactory::SyncComponents
 }
 
 ProfileSyncComponentsFactory::SyncComponents
-    ProfileSyncComponentsFactoryImpl::CreatePreferenceSyncComponents(
-        ProfileSyncService* profile_sync_service,
-        UnrecoverableErrorHandler* error_handler) {
-  base::WeakPtr<SyncableService> pref_sync_service =
-      profile_->GetPrefs()->GetSyncableService()->AsWeakPtr();
-  sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
-  GenericChangeProcessor* change_processor =
-      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);
-}
-
-ProfileSyncComponentsFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateThemeSyncComponents(
         ProfileSyncService* profile_sync_service,
         UnrecoverableErrorHandler* error_handler) {
@@ -372,41 +318,3 @@ ProfileSyncComponentsFactory::SyncComponents
       new SessionChangeProcessor(error_handler, model_associator);
   return SyncComponents(model_associator, change_processor);
 }
-
-ProfileSyncComponentsFactory::SyncComponents
-    ProfileSyncComponentsFactoryImpl::CreateSearchEngineSyncComponents(
-        ProfileSyncService* profile_sync_service,
-        UnrecoverableErrorHandler* error_handler) {
-  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(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);
-}
-
-ProfileSyncComponentsFactory::SyncComponents
-    ProfileSyncComponentsFactoryImpl::CreateAppNotificationSyncComponents(
-        ProfileSyncService* profile_sync_service,
-        browser_sync::UnrecoverableErrorHandler* error_handler) {
-  base::WeakPtr<SyncableService> notif_sync_service =
-      profile_->GetExtensionService()->app_notification_manager()->AsWeakPtr();
-  DCHECK(notif_sync_service);
-  sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
-  GenericChangeProcessor* change_processor =
-      new GenericChangeProcessor(error_handler,
-                                 notif_sync_service,
-                                 user_share);
-  SyncableServiceAdapter* sync_service_adapter =
-      new SyncableServiceAdapter(syncable::APP_NOTIFICATIONS,
-                                 notif_sync_service,
-                                 change_processor);
-  return SyncComponents(sync_service_adapter, change_processor);
-}