The AutofillProfileSyncableService's lifetime should be managed by the WebDataService

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/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 23 matching lines @@
 #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"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
+#include "chrome/browser/webdata/autofill_table.h"
+#include "chrome/browser/webdata/web_database.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 
 using browser_sync::AppDataTypeController;
 using browser_sync::AutofillChangeProcessor;
 using browser_sync::AutofillDataTypeController;
 using browser_sync::AutofillProfileDataTypeController;
 using browser_sync::AutofillModelAssociator;
-using browser_sync::AutofillProfileSyncableService;
 using browser_sync::BookmarkChangeProcessor;
 using browser_sync::BookmarkDataTypeController;
 using browser_sync::BookmarkModelAssociator;
 using browser_sync::DataTypeController;
 using browser_sync::DataTypeManager;
 using browser_sync::DataTypeManagerImpl;
 using browser_sync::ExtensionDataTypeController;
 using browser_sync::ExtensionSettingDataTypeController;
 using browser_sync::GenericChangeProcessor;
 using browser_sync::PasswordChangeProcessor;
@@ skipping 151 matching lines @@
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents(
     ProfileSyncService* profile_sync_service,
     WebDatabase* web_database,
     browser_sync::UnrecoverableErrorHandler* error_handler) {
   AutofillProfileSyncableService* sync_service =
-      new AutofillProfileSyncableService(web_database,
-                                         profile_sync_service->profile());
+      web_database->GetAutofillTable()->GetSyncableService(
+            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);
 }
 
@@ skipping 128 matching lines @@
   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);
   SyncableServiceAdapter* sync_service_adapter =
       new SyncableServiceAdapter(syncable::SEARCH_ENGINES,
                                  se_sync_service,
                                  change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }