Add billing address to masked server 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 271967ecb9d09daf47fb8d5276c255342460e7d6..03e9be0c33efe120a6e8ac66e4819050459f635c 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -31,6 +31,7 @@
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/payments/full_card_request.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/prefs/pref_service.h"
@@ -426,6 +427,19 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetCreditCard(
   return ConvertUTF8ToJavaString(env, card.guid());
 }
 
+
+void PersonalDataManagerAndroid::UpdateServerCardBillingAddress(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& unused_obj,
+    const JavaParamRef<jstring>& jguid,
+    const JavaParamRef<jstring>& jbilling_address_id) {
+  CreditCard card(ConvertJavaStringToUTF8(env, jguid), kSettingsOrigin);
+  card.set_record_type(CreditCard::MASKED_SERVER_CARD);
+  card.set_billing_address_id(ConvertJavaStringToUTF8(env,
+      jbilling_address_id));
+  personal_data_manager_->UpdateServerCardBillingAddress(card);
+}
+
 void PersonalDataManagerAndroid::AddServerCreditCardForTest(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& unused_obj,