[Autofill] Distinguish between native field types and potentially HTML field types.

chrome/browser/autofill/android/personal_data_manager_android.cc

 // Copyright 2013 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/autofill/android/personal_data_manager_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #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/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "jni/PersonalDataManager_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace autofill {
@@ skipping 22 matching lines @@
           env,
           profile.GetRawInfo(ADDRESS_HOME_CITY)).obj(),
       ConvertUTF16ToJavaString(
           env,
           profile.GetRawInfo(ADDRESS_HOME_STATE)).obj(),
       ConvertUTF16ToJavaString(
           env,
           profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(),
       ConvertUTF16ToJavaString(
           env,
-          profile.GetInfo(ADDRESS_HOME_COUNTRY,
+          profile.GetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
                           g_browser_process->GetApplicationLocale())).obj(),
       ConvertUTF16ToJavaString(
           env,
           profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(EMAIL_ADDRESS)).obj());
 }
 
 void PopulateNativeProfileFromJava(
     const jobject& jprofile,
     JNIEnv* env,
@@ skipping 23 matching lines @@
           Java_AutofillProfile_getCity(env, jprofile)));
   profile->SetRawInfo(
       ADDRESS_HOME_STATE,
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getState(env, jprofile)));
   profile->SetRawInfo(
       ADDRESS_HOME_ZIP,
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getZip(env, jprofile)));
   profile->SetInfo(
-      ADDRESS_HOME_COUNTRY,
+      AutofillType(ADDRESS_HOME_COUNTRY),
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getCountry(env, jprofile)),
       g_browser_process->GetApplicationLocale());
   profile->SetRawInfo(
       PHONE_HOME_WHOLE_NUMBER,
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getPhoneNumber(env, jprofile)));
   profile->SetRawInfo(
       EMAIL_ADDRESS,
       ConvertJavaStringToUTF16(
@@ skipping 180 matching lines @@
           g_browser_process->GetApplicationLocale())).Release();
 }
 
 static jint Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<jint>(personal_data_manager_android);
 }
 
 }  // namespace autofill