Use/save language code for autofill profiles.

chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc

 // Copyright 2015 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/android/preferences/autofill/autofill_profile_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 29 matching lines @@
   POSTAL_CODE,         // Zip or postal code.
   STREET_ADDRESS,      // Street address lines.
   ORGANIZATION,        // Organization, company, firm, institution, etc.
   RECIPIENT            // Name.
 };
 
 } // namespace
 
 static jstring GetDefaultCountryCode(JNIEnv* env,
                                     jclass clazz) {
-  std::string defaultCountryCode =
+  std::string default_country_code =
       autofill::AutofillCountry::CountryCodeForLocale(
           g_browser_process->GetApplicationLocale());
-  return ConvertUTF8ToJavaString(env, defaultCountryCode).Release();
+  return ConvertUTF8ToJavaString(env, default_country_code).Release();
 }
 
 static void GetSupportedCountries(JNIEnv* env,
                                   jclass clazz,
                                   jobject j_country_code_list,
                                   jobject j_country_name_list) {
   std::vector<std::string> country_codes =
       ::i18n::addressinput::GetRegionCodes();
   std::vector<base::string16> country_names;
   std::string locale = g_browser_process->GetApplicationLocale();
   for (auto country_code : country_codes) {
     country_names.push_back(l10n_util::GetDisplayNameForCountry(country_code,
                                                                 locale));
   }
 
   Java_AutofillProfileBridge_stringArrayToList(env,
                                                ToJavaArrayOfStrings(
                                                    env, country_codes).obj(),
                                                j_country_code_list);
   Java_AutofillProfileBridge_stringArrayToList(env,
                                                ToJavaArrayOfStrings(
                                                    env, country_names).obj(),
                                                j_country_name_list);
 }
 
-static void GetAddressUiComponents(JNIEnv* env,
+static jstring GetAddressUiComponents(JNIEnv* env,
                                    jclass clazz,
                                    jstring j_country_code,
+                                   jstring j_language_code,
                                    jobject j_id_list,
                                    jobject j_name_list) {
   std::string best_language_tag;
   std::vector<int> component_ids;
   std::vector<std::string> component_labels;
   ::i18n::addressinput::Localization localization;
   localization.SetGetter(l10n_util::GetStringUTF8);
 
+  std::string language_code;
+  if (j_language_code != NULL) {
+    language_code = ConvertJavaStringToUTF8(env, j_language_code);
+  }
+  if (language_code.empty()) {
+    language_code = g_browser_process->GetApplicationLocale();
+  }
+
   std::vector<::i18n::addressinput::AddressUiComponent> ui_components =
       ::i18n::addressinput::BuildComponents(
           ConvertJavaStringToUTF8(env, j_country_code), localization,
-          g_browser_process->GetApplicationLocale(), &best_language_tag);
+          language_code, &best_language_tag);
 
   for (auto ui_component : ui_components) {
     component_labels.push_back(ui_component.name);
 
     switch (ui_component.field) {
           case ::i18n::addressinput::COUNTRY:
             component_ids.push_back(AddressField::COUNTRY);
             break;
           case ::i18n::addressinput::ADMIN_AREA:
             component_ids.push_back(AddressField::ADMIN_AREA);
@@ skipping 25 matching lines @@
   }
 
   Java_AutofillProfileBridge_intArrayToList(env,
                                             ToJavaIntArray(
                                                    env, component_ids).obj(),
                                                j_id_list);
   Java_AutofillProfileBridge_stringArrayToList(env,
                                                ToJavaArrayOfStrings(
                                                    env, component_labels).obj(),
                                                j_name_list);
+
+  return ConvertUTF8ToJavaString(env, best_language_tag).Release();
 }
 
 // static
 bool RegisterAutofillProfileBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 } // namespace autofill