Add billing address to credit cards.

chrome/browser/autofill/android/personal_data_manager_android.cc

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 60b44415ef050476def77f71315e7aace7ba2bb7..55ce8a8dfb37c40a0d55c0e041fa920b595eedcf 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -154,18 +154,18 @@ const struct PaymentRequestData {
 // Converts the card type into PaymentRequest type according to the basic card
 // payment spec and an icon. Will set the type and the icon to "generic" for
 // unrecognized card type.
-const PaymentRequestData* GetPaymentRequestData(const std::string& type) {
+const PaymentRequestData& GetPaymentRequestData(const std::string& type) {
   for (size_t i = 0; i < arraysize(kPaymentRequestData); ++i) {
     if (type == kPaymentRequestData[i].card_type)
-      return &kPaymentRequestData[i];
+      return kPaymentRequestData[i];
   }
-  return &kPaymentRequestData[0];
+  return kPaymentRequestData[0];
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
     JNIEnv* env,
     const CreditCard& card) {
-  const PaymentRequestData* payment_request_data =
+  const PaymentRequestData& payment_request_data =
       GetPaymentRequestData(card.type());
   return Java_CreditCard_create(
       env, ConvertUTF8ToJavaString(env, card.guid()).obj(),
@@ -181,11 +181,10 @@ ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
       ConvertUTF16ToJavaString(env,
                                card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR))
           .obj(),
-      ConvertUTF8ToJavaString(env,
-                              payment_request_data->basic_card_payment_type)
+      ConvertUTF8ToJavaString(env, payment_request_data.basic_card_payment_type)
           .obj(),
-      ResourceMapper::MapFromChromiumId(
-          payment_request_data->icon_resource_id));
+      ResourceMapper::MapFromChromiumId(payment_request_data.icon_resource_id),
+      ConvertUTF8ToJavaString(env, card.billing_address_id()) .obj());
 }
 
 void PopulateNativeCreditCardFromJava(
@@ -206,6 +205,8 @@ void PopulateNativeCreditCardFromJava(
   card->SetRawInfo(
       CREDIT_CARD_EXP_4_DIGIT_YEAR,
       ConvertJavaStringToUTF16(Java_CreditCard_getYear(env, jcard)));
+  card->set_billing_address_id(
+      ConvertJavaStringToUTF8(Java_CreditCard_getBillingAddressId(env, jcard)));
 }
 
 // Self-deleting requester of full card details, including full PAN and the CVC