[android] Handle unknown country codes.

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"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "jni/AutofillProfileBridge_jni.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui_component.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/localization.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 29 matching lines @@
           g_browser_process->GetApplicationLocale());
   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::vector<std::string> known_country_codes;
+  std::vector<base::string16> known_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));
+    const base::string16& country_name =
+        l10n_util::GetDisplayNameForCountry(country_code, locale);
+    // Don't display a country code for which a name is not known yet.
+    if (country_name != base::UTF8ToUTF16(country_code)) {
+      known_country_codes.push_back(country_code);
+      known_country_names.push_back(country_name);
+    }
   }
 
-  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);
+  Java_AutofillProfileBridge_stringArrayToList(
+      env, ToJavaArrayOfStrings(env, known_country_codes).obj(),
+      j_country_code_list);
+  Java_AutofillProfileBridge_stringArrayToList(
+      env, ToJavaArrayOfStrings(env, known_country_names).obj(),
+      j_country_name_list);
 }
 
 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;
@@ skipping 61 matching lines @@
 
   return ConvertUTF8ToJavaString(env, best_language_tag).Release();
 }
 
 // static
 bool RegisterAutofillProfileBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 } // namespace autofill