Store the language code for the address in autofill profile.

chrome/browser/ui/autofill/data_model_wrapper.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/ui/autofill/data_model_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 40 matching lines @@
   base::string16 phone =
       GetInfoForDisplay(AutofillType(PHONE_HOME_WHOLE_NUMBER));
   if (phone.empty())
     return false;
 
   // Format the address.
   ::i18n::addressinput::AddressData address_data;
   i18ninput::CreateAddressData(
       base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)),
       &address_data);
+  address_data.language_code = GetLanguageCode();
   std::vector<std::string> lines;
   address_data.FormatForDisplay(&lines);
 
   // Email and phone number aren't part of address formatting.
   base::string16 non_address_info;
   base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS));
   if (!email.empty())
     non_address_info += base::ASCIIToUTF16("\n") + email;
 
   non_address_info += base::ASCIIToUTF16("\n") + phone;
 
   // The separator is locale-specific.
   std::string compact_separator =
-      ::i18n::addressinput::GetCompactAddressLinesSeparator(
-          g_browser_process->GetApplicationLocale());
+      ::i18n::addressinput::GetCompactAddressLinesSeparator(GetLanguageCode());
   *vertically_compact =
       base::UTF8ToUTF16(JoinString(lines, compact_separator)) +
           non_address_info;
   *horizontally_compact = base::UTF8ToUTF16(JoinString(lines, "\n")) +
       non_address_info;
 
   return true;
 }
 
+const std::string& DataModelWrapper::GetLanguageCode() const {
+  return g_browser_process->GetApplicationLocale();
+}
+
 bool DataModelWrapper::FillFormStructure(
     const std::vector<ServerFieldType>& types,
     const FormStructure::InputFieldComparator& compare,
     FormStructure* form_structure) const {
   return form_structure->FillFields(
       types,
       compare,
       base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)),
       g_browser_process->GetApplicationLocale());
 }
@@ skipping 47 matching lines @@
       i18n::PhoneObject phone(phone_number, region);
       return phone.GetFormattedNumber();
     }
 
     return phone_number;
   }
 
   return DataModelWrapper::GetInfoForDisplay(type);
 }
 
+const std::string& AutofillProfileWrapper::GetLanguageCode() const {
+  return profile_->language_code();
+}
+
 size_t AutofillProfileWrapper::GetVariantForType(const AutofillType& type)
     const {
   if (type.group() == variant_group_)
     return variant_;
 
   return 0;
 }
 
 // AutofillShippingAddressWrapper
 
@@ skipping 193 matching lines @@
     return base::string16();
 
   if (field == ::i18n::addressinput::COUNTRY) {
     return AutofillCountry(address_->country_code,
                            g_browser_process->GetApplicationLocale()).name();
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
+const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
+  return address_->language_code;
+}
+
 }  // namespace autofill