Moved WebDataService to ProfileKeyedService

chrome/browser/sync/profile_sync_components_factory_impl.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
@@ skipping 29 matching lines @@
 #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/glue/ui_data_type_controller.h"
 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 using browser_sync::AppNotificationDataTypeController;
 using browser_sync::AutofillDataTypeController;
 using browser_sync::AutofillProfileDataTypeController;
 using browser_sync::BookmarkChangeProcessor;
 using browser_sync::BookmarkDataTypeController;
 using browser_sync::BookmarkModelAssociator;
@@ skipping 20 matching lines @@
 using browser_sync::TypedUrlModelAssociator;
 using browser_sync::UIDataTypeController;
 using browser_sync::DataTypeErrorHandler;
 using content::BrowserThread;
 
 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
     Profile* profile, CommandLine* command_line)
     : profile_(profile),
       command_line_(command_line),
       extension_system_(
-          ExtensionSystem::Get(profile)) {
+          ExtensionSystemFactory::GetForProfile(profile)),
+      web_data_service_(WebDataServiceFactory::GetForProfile(
+          profile_, Profile::IMPLICIT_ACCESS)) {
+}
+
+ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() {
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
     ProfileSyncService* pss) {
   // App sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncApps)) {
     pss->RegisterDataTypeController(
         new ExtensionDataTypeController(syncable::APPS, this, profile_, pss));
   }
@@ skipping 119 matching lines @@
 base::WeakPtr<SyncableService> ProfileSyncComponentsFactoryImpl::
     GetSyncableServiceForType(syncable::ModelType type) {
   if (!profile_) {  // For tests.
      return base::WeakPtr<SyncableService>();
   }
   switch (type) {
     case syncable::PREFERENCES:
       return profile_->GetPrefs()->GetSyncableService()->AsWeakPtr();
     case syncable::AUTOFILL:
     case syncable::AUTOFILL_PROFILE: {
-      WebDataService* wds =
-          profile_->GetWebDataService(Profile::IMPLICIT_ACCESS);
-      if (!wds)
+      if (!web_data_service_.get())
         return base::WeakPtr<SyncableService>();
-      if (type == syncable::AUTOFILL)
-        return wds->GetAutocompleteSyncableService()->AsWeakPtr();
-      else
-        return wds->GetAutofillProfileSyncableService()->AsWeakPtr();
+      if (type == syncable::AUTOFILL) {
+        return web_data_service_->GetAutocompleteSyncableService()->AsWeakPtr();
+      } else {
+        return web_data_service_->
+                   GetAutofillProfileSyncableService()->AsWeakPtr();
+      }
     }
     case syncable::APPS:
     case syncable::EXTENSIONS:
       return extension_system_->extension_service()->AsWeakPtr();
     case syncable::SEARCH_ENGINES:
       return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr();
     case syncable::APP_SETTINGS:
     case syncable::EXTENSION_SETTINGS:
       return extension_system_->extension_service()->settings_frontend()->
           GetBackendForSync(type)->AsWeakPtr();
@@ skipping 86 matching lines @@
 ProfileSyncComponentsFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
        ProfileSyncService* profile_sync_service,
         DataTypeErrorHandler* error_handler) {
   SessionModelAssociator* model_associator =
       new SessionModelAssociator(profile_sync_service, error_handler);
   SessionChangeProcessor* change_processor =
       new SessionChangeProcessor(error_handler, model_associator);
   return SyncComponents(model_associator, change_processor);
 }