Add billing address to credit cards.

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 <stddef.h>
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ skipping 136 matching lines @@
   {"dinersCC", "diners", IDR_AUTOFILL_PR_GENERIC},
   {"discoverCC", "discover", IDR_AUTOFILL_PR_DISCOVER},
   {"jcbCC", "jcb", IDR_AUTOFILL_PR_GENERIC},
   {"masterCardCC", "mastercard", IDR_AUTOFILL_PR_MASTERCARD},
   {"visaCC", "visa", IDR_AUTOFILL_PR_VISA}
 };
 
 // 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(),
       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_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(),
-      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(
     const jobject& jcard,
     JNIEnv* env,
     CreditCard* card) {
   card->set_origin(
       ConvertJavaStringToUTF8(Java_CreditCard_getOrigin(env, jcard)));
   card->SetRawInfo(
       CREDIT_CARD_NAME_FULL,
       ConvertJavaStringToUTF16(Java_CreditCard_getName(env, jcard)));
   card->SetRawInfo(
       CREDIT_CARD_NUMBER,
       ConvertJavaStringToUTF16(Java_CreditCard_getNumber(env, jcard)));
   card->SetRawInfo(
       CREDIT_CARD_EXP_MONTH,
       ConvertJavaStringToUTF16(Java_CreditCard_getMonth(env, jcard)));
   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
 // number.
 class FullCardRequester : public payments::FullCardRequest::Delegate,
                           public base::SupportsWeakPtr<FullCardRequester> {
  public:
   FullCardRequester() {}
 
   void GetFullCard(JNIEnv* env,
@@ skipping 359 matching lines @@
                base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill