| Index: chrome/browser/autofill/android/personal_data_manager_android.cc
|
| diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
|
| index 1b79b7044a76ed8c61d00111504253e94272ad77..534bf9c52fe31454c9a1f37099e27a18e24d5f47 100644
|
| --- a/chrome/browser/autofill/android/personal_data_manager_android.cc
|
| +++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
|
| @@ -129,13 +129,15 @@ ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
|
| ConvertUTF8ToJavaString(env, card.origin()).obj(),
|
| card.record_type() == CreditCard::LOCAL_CARD,
|
| card.record_type() == CreditCard::FULL_SERVER_CARD,
|
| - ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME)).obj(),
|
| + ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME_FULL))
|
| + .obj(),
|
| ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NUMBER)).obj(),
|
| ConvertUTF16ToJavaString(env, card.TypeAndLastFourDigits()).obj(),
|
| ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
|
| .obj(),
|
| - ConvertUTF16ToJavaString(
|
| - env, card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR)).obj());
|
| + ConvertUTF16ToJavaString(env,
|
| + card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR))
|
| + .obj());
|
| }
|
|
|
| void PopulateNativeCreditCardFromJava(
|
| @@ -145,7 +147,7 @@ void PopulateNativeCreditCardFromJava(
|
| card->set_origin(
|
| ConvertJavaStringToUTF8(Java_CreditCard_getOrigin(env, jcard)));
|
| card->SetRawInfo(
|
| - CREDIT_CARD_NAME,
|
| + CREDIT_CARD_NAME_FULL,
|
| ConvertJavaStringToUTF16(Java_CreditCard_getName(env, jcard)));
|
| card->SetRawInfo(
|
| CREDIT_CARD_NUMBER,
|
|
|