[Sync] Convert Autocomplete to use sync's report error function.

components/webdata_services/web_data_service_wrapper.cc

 // Copyright 2014 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 "components/webdata_services/web_data_service_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
@@ skipping 21 matching lines @@
 #endif
 
 namespace {
 
 void InitSyncableServicesOnDBThread(
     scoped_refptr<base::SingleThreadTaskRunner> db_thread,
     const syncer::SyncableService::StartSyncFlare& sync_flare,
     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());
 
   // Currently only Autocomplete and Autofill profiles use the new Sync API, but
   // 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);
     autofill::AutocompleteSyncableService::FromWebDataService(
         autofill_web_data.get())
         ->InjectStartSyncFlare(sync_flare);
   }
 
   autofill::AutofillProfileSyncableService::CreateForWebDataServiceAndBackend(
       autofill_web_data.get(), autofill_backend, app_locale);
@@ skipping 13 matching lines @@
 
 WebDataServiceWrapper::WebDataServiceWrapper() {
 }
 
 WebDataServiceWrapper::WebDataServiceWrapper(
     const base::FilePath& context_path,
     const std::string& application_locale,
     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);
 
   // All tables objects that participate in managing the database must
   // be added here.
   web_database_->AddTable(base::WrapUnique(new autofill::AutofillTable));
   web_database_->AddTable(base::WrapUnique(new KeywordTable));
   // TODO(mdm): We only really need the LoginsTable on Windows for IE7 password
   // access, but for now, we still create it on all platforms since it deletes
   // the old logins table. We can remove this after a while, e.g. in M22 or so.
@@ skipping 16 matching lines @@
       base::Bind(show_error_callback, ERROR_LOADING_TOKEN));
   token_web_data_->Init();
 
 #if defined(OS_WIN)
   password_web_data_ = new PasswordWebDataService(
       web_database_, ui_thread,
       base::Bind(show_error_callback, ERROR_LOADING_PASSWORD));
   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() {
 }
 
 void WebDataServiceWrapper::Shutdown() {
   autofill_web_data_->ShutdownOnUIThread();
   keyword_web_data_->ShutdownOnUIThread();
   token_web_data_->ShutdownOnUIThread();
 
@@ skipping 17 matching lines @@
 scoped_refptr<TokenWebData> WebDataServiceWrapper::GetTokenWebData() {
   return token_web_data_.get();
 }
 
 #if defined(OS_WIN)
 scoped_refptr<PasswordWebDataService>
 WebDataServiceWrapper::GetPasswordWebData() {
   return password_web_data_.get();
 }
 #endif