Make autofill's Address store country using the country code so that app locale isn't needed for th…

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/profile_dependency_manager.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
@@ skipping 10 matching lines @@
 namespace {
 
 // 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) {
+    scoped_refptr<AutofillWebDataService> autofill_web_data,
+    const std::string& app_locale) {
   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);
-  AutofillProfileSyncableService::CreateForWebDataService(autofill_web_data);
+  AutofillProfileSyncableService::CreateForWebDataService(
+      autofill_web_data, app_locale);
 }
 
 }  // namespace
 
 WebDataServiceWrapper::WebDataServiceWrapper() {}
 
 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) {
   base::FilePath path = profile->GetPath();
   path = path.Append(kWebDataFilename);
 
@@ skipping 24 matching lines @@
   web_database_->LoadDatabase(WebDatabaseService::InitCallback());
 
   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_));
+  BrowserThread::PostTask(
+      BrowserThread::DB, FROM_HERE,
+      base::Bind(&InitSyncableServicesOnDBThread,
+                 autofill_web_data_,
+                 g_browser_process->GetApplicationLocale()));
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {
 }
 
 void WebDataServiceWrapper::Shutdown() {
   autofill_web_data_->ShutdownOnUIThread();
   web_data_->ShutdownOnUIThread();
   web_database_->ShutdownDatabase();
 }
@@ skipping 77 matching lines @@
 }
 
 ProfileKeyedService*
 WebDataServiceFactory::BuildServiceInstanceFor(Profile* profile) const {
   return new WebDataServiceWrapper(profile);
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }