[Android] Test for the country codes support in PDM.AutofillProfile

BUG=259385
TEST=PersonalDataManagerTest

Review URL: https://chromiumcodereview.appspot.com/18341030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215406 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index a853f92..9285982 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "jni/PersonalDataManager_jni.h"
@@ -213,7 +214,6 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetProfile(
   return ConvertUTF8ToJavaString(env, profile.guid());
 }
 
-
 jint PersonalDataManagerAndroid::GetCreditCardCount(JNIEnv* unused_env,
                                                     jobject unused_obj) {
   return personal_data_manager_->GetCreditCards().size();
@@ -282,6 +282,16 @@ bool PersonalDataManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+// Returns an ISO 3166-1-alpha-2 country code for a |jcountry_name| using
+// the application locale, or an empty string.
+static jstring ToCountryCode(JNIEnv* env, jclass clazz, jstring jcountry_name) {
+  return ConvertUTF8ToJavaString(
+      env,
+      AutofillCountry::GetCountryCode(
+          base::android::ConvertJavaStringToUTF16(env, jcountry_name),
+          g_browser_process->GetApplicationLocale())).Release();
+}
+
 static jint Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);