Use SetRawInfo in PersonalDataManagerAndroid::PopulateNativeProfileFromJava

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_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
@@ skipping 58 matching lines @@
       ConvertUTF8ToJavaString(env, profile.language_code()).obj());
 }
 
 void PopulateNativeProfileFromJava(
     const jobject& jprofile,
     JNIEnv* env,
     AutofillProfile* profile) {
   profile->set_origin(
       ConvertJavaStringToUTF8(
           Java_AutofillProfile_getOrigin(env, jprofile)));
-  profile->SetInfo(
-      AutofillType(NAME_FULL),
+  profile->SetRawInfo(autofill::NAME_FULL,

[Evan Stade, 2015/05/15 22:26:45]

this one should be SetInfo (note that AutofillOptionsHandler uses
AutofillProfile::CopyAndUpdateNameList which uses SetInfo)

[Theresa, 2015/05/16 04:37:22]

Done.

+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getFullName(env, jprofile)));
+  profile->SetRawInfo(autofill::COMPANY_NAME,
+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getCompanyName(env, jprofile)));
+  profile->SetRawInfo(
+      autofill::ADDRESS_HOME_STREET_ADDRESS,
       ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getFullName(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(COMPANY_NAME),
+          Java_AutofillProfile_getStreetAddress(env, jprofile)));
+  profile->SetRawInfo(
+      autofill::ADDRESS_HOME_STATE,
+      ConvertJavaStringToUTF16(Java_AutofillProfile_getRegion(env, jprofile)));
+  profile->SetRawInfo(autofill::ADDRESS_HOME_CITY,
+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getLocality(env, jprofile)));
+  profile->SetRawInfo(
+      autofill::ADDRESS_HOME_DEPENDENT_LOCALITY,
       ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getCompanyName(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_STREET_ADDRESS),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getStreetAddress(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_STATE),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getRegion(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_CITY),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getLocality(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_DEPENDENT_LOCALITY),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getDependentLocality(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_ZIP),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getPostalCode(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_SORTING_CODE),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getSortingCode(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
-                   ConvertJavaStringToUTF16(
-                       Java_AutofillProfile_getCountryCode(env, jprofile)),
-                   g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(PHONE_HOME_WHOLE_NUMBER),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getPhoneNumber(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(EMAIL_ADDRESS),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getEmailAddress(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
+          Java_AutofillProfile_getDependentLocality(env, jprofile)));
+  profile->SetRawInfo(autofill::ADDRESS_HOME_ZIP,
+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getPostalCode(env, jprofile)));
+  profile->SetRawInfo(autofill::ADDRESS_HOME_SORTING_CODE,
+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getSortingCode(env, jprofile)));
+  profile->SetRawInfo(autofill::ADDRESS_HOME_COUNTRY,
+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getCountryCode(env, jprofile)));
+  profile->SetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER,
+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getPhoneNumber(env, jprofile)));
+  profile->SetRawInfo(autofill::EMAIL_ADDRESS,
+                      ConvertJavaStringToUTF16(
+                          Java_AutofillProfile_getEmailAddress(env, jprofile)));
   profile->set_language_code(
       ConvertJavaStringToUTF8(
           Java_AutofillProfile_getLanguageCode(env, jprofile)));
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
     JNIEnv* env,
     const CreditCard& card) {
   return Java_CreditCard_create(
       env, ConvertUTF8ToJavaString(env, card.guid()).obj(),
@@ skipping 218 matching lines @@
           g_browser_process->GetApplicationLocale())).Release();
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill