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 66bcef71cf9f65f9c3eb61ec77d57a676e899b3d..9be570a7f87e6de3b8a4e30359251e9c58783fdd 100644 |
--- a/chrome/browser/webdata/web_data_service_factory.cc |
+++ b/chrome/browser/webdata/web_data_service_factory.cc |
@@ -21,6 +21,7 @@ |
#include "chrome/browser/webdata/web_intents_table.h" |
#include "components/autofill/browser/autofill_country.h" |
#include "components/autofill/browser/webdata/autofill_table.h" |
+#include "components/autofill/browser/webdata/autofill_webdata_backend.h" |
#include "components/autofill/browser/webdata/autofill_webdata_service.h" |
#include "components/webdata/common/webdata_constants.h" |
#include "content/public/browser/browser_thread.h" |
@@ -42,16 +43,18 @@ void ProfileErrorCallback(sql::InitStatus status) { |
void InitSyncableServicesOnDBThread( |
scoped_refptr<AutofillWebDataService> autofill_web_data, |
const syncer::SyncableService::StartSyncFlare& flare, |
- 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::CreateForWebDataService( |
+ autofill_web_data, autofill_backend); |
AutocompleteSyncableService::FromWebDataService( |
autofill_web_data)->InjectStartSyncFlare(flare); |
AutofillProfileSyncableService::CreateForWebDataService( |
- autofill_web_data, app_locale); |
+ autofill_web_data, autofill_backend, app_locale); |
} |
} // namespace |
@@ -95,8 +98,7 @@ WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) { |
web_database_, base::Bind(&ProfileErrorCallback)); |
web_data_->Init(); |
- BrowserThread::PostTask( |
- BrowserThread::DB, FROM_HERE, |
+ autofill_web_data_->GetAutofillBackend( |
base::Bind(&InitSyncableServicesOnDBThread, |
autofill_web_data_, |
sync_start_util::GetFlareForSyncableService(path), |