Hook up Autofill Backend interface to SyncableServices

chrome/browser/webdata/web_data_service_factory.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 "chrome/browser/webdata/web_data_service_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ skipping 24 matching lines @@
 // Callback to show error dialog on profile load error.
 void ProfileErrorCallback(sql::InitStatus status) {
   ShowProfileErrorDialog(
       (status == sql::INIT_FAILURE) ?
       IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
 }
 
 void InitSyncableServicesOnDBThread(
     scoped_refptr<AutofillWebDataService> autofill_web_data,
     const base::FilePath& profile_path,
-    const std::string& app_locale) {
+    const std::string& app_locale,
+    autofill::AutofillWebDataBackend* autofill_backend) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   // Currently only Autocomplete and Autofill profiles use the new Sync API, but
   // all the database data should migrate to this API over time.
-  AutocompleteSyncableService::CreateForWebDataService(autofill_web_data);
+  AutocompleteSyncableService::CreateForWebDataServiceAndBackend(
+      autofill_web_data, autofill_backend);
   AutocompleteSyncableService::FromWebDataService(
       autofill_web_data)->InjectStartSyncFlare(
           sync_start_util::GetFlareForSyncableService(profile_path));
-  AutofillProfileSyncableService::CreateForWebDataService(
-      autofill_web_data, app_locale);
+  AutofillProfileSyncableService::CreateForWebDataServiceAndBackend(
+      autofill_web_data, autofill_backend, app_locale);
   AutofillProfileSyncableService::FromWebDataService(
       autofill_web_data)->InjectStartSyncFlare(
           sync_start_util::GetFlareForSyncableService(profile_path));
 }
 
 }  // namespace
 
 WebDataServiceWrapper::WebDataServiceWrapper() {}
 
 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) {
@@ skipping 26 matching lines @@
   web_database_->LoadDatabase();
 
   autofill_web_data_ = new AutofillWebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   autofill_web_data_->Init();
 
   web_data_ = new WebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   web_data_->Init();
 
-  BrowserThread::PostTask(
-      BrowserThread::DB, FROM_HERE,
-      base::Bind(&InitSyncableServicesOnDBThread,
-                 autofill_web_data_,
-                 profile_path,
-                 g_browser_process->GetApplicationLocale()));
+autofill_web_data_->GetAutofillBackend(
+       base::Bind(&InitSyncableServicesOnDBThread,
+                  autofill_web_data_,
+                  profile_path,
+                  g_browser_process->GetApplicationLocale()));
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {
 }
 
 void WebDataServiceWrapper::Shutdown() {
   autofill_web_data_->ShutdownOnUIThread();
   web_data_->ShutdownOnUIThread();
   web_database_->ShutdownDatabase();
 }
@@ skipping 79 matching lines @@
 }
 
 BrowserContextKeyedService* WebDataServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new WebDataServiceWrapper(static_cast<Profile*>(profile));
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }