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

chrome/browser/webdata/autofill_profile_syncable_service.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/autofill_profile_syncable_service.h"
 
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
+#include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/form_group.h"
 #include "components/webdata/autofill/autofill_table.h"
 #include "components/webdata/autofill/autofill_webdata_service.h"
 #include "components/webdata/common/web_database.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/sync.pb.h"
 
@@ skipping 287 matching lines @@
   diff = UpdateMultivaluedField(NAME_LAST,
                                 specifics.name_last(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_LINE1,
                      specifics.address_home_line1(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_LINE2,
                      specifics.address_home_line2(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_CITY,
                      specifics.address_home_city(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_STATE,
                      specifics.address_home_state(), profile) || diff;
-  diff = UpdateField(ADDRESS_HOME_COUNTRY,
-                     specifics.address_home_country(), profile) || diff;
+  string16 country_name_or_code =
+      ASCIIToUTF16(specifics.address_home_country());
+  std::string country_code = AutofillCountry::GetCountryCode(
+      country_name_or_code, g_browser_process->GetApplicationLocale());

[Ilya Sherman, 2013/04/05 05:18:01]

Again, this happens on the DB thread (I think), so it's not safe to call into
g_browser_process.

[jam, 2013/04/05 06:45:54]

Done.

[jam, 2013/04/05 06:45:54]

Done.

+  diff = UpdateField(ADDRESS_HOME_COUNTRY, country_code, profile) || diff;
   diff = UpdateField(ADDRESS_HOME_ZIP,
                      specifics.address_home_zip(), profile) || diff;
   diff = UpdateMultivaluedField(EMAIL_ADDRESS,
                                 specifics.email_address(), profile) || diff;
   diff = UpdateField(COMPANY_NAME, specifics.company_name(), profile) || diff;
   diff = UpdateMultivaluedField(PHONE_HOME_WHOLE_NUMBER,
                                 specifics.phone_home_whole_number(),
                                 profile) || diff;
   return diff;
 }
@@ skipping 226 matching lines @@
   return (merge_into->Compare(merge_from) != 0);
 }
 
 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const {
   return AutofillTable::FromWebDatabase(web_data_service_->GetDatabase());
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {}