Hook up Autofill Backend interface to SyncableServices

chrome/browser/webdata/web_data_service_factory.cc

Index: chrome/browser/webdata/web_data_service_factory.cc
diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc
index 92e552aade760b3bb88338943d16e12cd6763383..c12d7e0599cae3a6ce26d380e436ccadfbedda97 100644
--- a/chrome/browser/webdata/web_data_service_factory.cc
+++ b/chrome/browser/webdata/web_data_service_factory.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "components/autofill/browser/autofill_country.h"
+#include "components/autofill/browser/webdata/autofill_backend_delegate.h"
 #include "components/autofill/browser/webdata/autofill_table.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/webdata_constants.h"
@@ -38,15 +39,17 @@ void ProfileErrorCallback(sql::InitStatus status) {
 }
 
 void InitSyncableServicesOnDBThread(
-    scoped_refptr<AutofillWebDataService> autofill_web_data,
-    const std::string& app_locale) {
+    const std::string& app_locale,
+    autofill::AutofillWebDataService* autofill_web_data,
+    autofill::AutofillBackendDelegate* delegate) {
   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::CreateForWebDataService(
+      autofill_web_data, delegate);
   AutofillProfileSyncableService::CreateForWebDataService(
-      autofill_web_data, app_locale);
+      autofill_web_data, delegate, app_locale);
 }
 
 }  // namespace
@@ -90,11 +93,10 @@ WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) {
       web_database_, base::Bind(&ProfileErrorCallback));
   web_data_->Init();
 
-  BrowserThread::PostTask(
-      BrowserThread::DB, FROM_HERE,
+  autofill_web_data_->GetDelegateOnDB(
       base::Bind(&InitSyncableServicesOnDBThread,
-                 autofill_web_data_,
-                 g_browser_process->GetApplicationLocale()));
+                 g_browser_process->GetApplicationLocale(),
+                 autofill_web_data_));
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {