| Index: components/webdata_services/web_data_service_wrapper.cc
|
| diff --git a/components/webdata_services/web_data_service_wrapper.cc b/components/webdata_services/web_data_service_wrapper.cc
|
| index a8ff689fe4836b1adf07310d24d89418b6f93ea7..292fd1040a2d76b13effed75334da9693d84661c 100644
|
| --- a/components/webdata_services/web_data_service_wrapper.cc
|
| +++ b/components/webdata_services/web_data_service_wrapper.cc
|
| @@ -39,6 +39,7 @@ void InitSyncableServicesOnDBThread(
|
| const scoped_refptr<autofill::AutofillWebDataService>& autofill_web_data,
|
| const base::FilePath& context_path,
|
| const std::string& app_locale,
|
| + version_info::Channel channel,
|
| autofill::AutofillWebDataBackend* autofill_backend) {
|
| DCHECK(db_thread->BelongsToCurrentThread());
|
|
|
| @@ -46,7 +47,7 @@ void InitSyncableServicesOnDBThread(
|
| // all the database data should migrate to this API over time.
|
| if (base::FeatureList::IsEnabled(switches::kSyncUSSAutocomplete)) {
|
| autofill::AutocompleteSyncBridge::CreateForWebDataServiceAndBackend(
|
| - autofill_web_data.get(), autofill_backend);
|
| + autofill_web_data.get(), autofill_backend, channel);
|
| } else {
|
| autofill::AutocompleteSyncableService::CreateForWebDataServiceAndBackend(
|
| autofill_web_data.get(), autofill_backend);
|
| @@ -80,7 +81,8 @@ WebDataServiceWrapper::WebDataServiceWrapper(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
|
| const syncer::SyncableService::StartSyncFlare& flare,
|
| - const ShowErrorCallback& show_error_callback) {
|
| + const ShowErrorCallback& show_error_callback,
|
| + version_info::Channel channel) {
|
| base::FilePath path = context_path.Append(kWebDataFilename);
|
| web_database_ = new WebDatabaseService(path, ui_thread, db_thread);
|
|
|
| @@ -117,9 +119,9 @@ WebDataServiceWrapper::WebDataServiceWrapper(
|
| password_web_data_->Init();
|
| #endif
|
|
|
| - autofill_web_data_->GetAutofillBackend(
|
| - base::Bind(&InitSyncableServicesOnDBThread, db_thread, flare,
|
| - autofill_web_data_, context_path, application_locale));
|
| + autofill_web_data_->GetAutofillBackend(base::Bind(
|
| + &InitSyncableServicesOnDBThread, db_thread, flare, autofill_web_data_,
|
| + context_path, application_locale, channel));
|
| }
|
|
|
| WebDataServiceWrapper::~WebDataServiceWrapper() {
|
|
|