[Payments] Update metadata instead of billing address for server 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 3a5ad199fa1ab9d30acf74e136fa25c8d6858177..65974889a5da68434bee7dedcb7cdc4a1d94d1d8 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -529,17 +529,14 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetCreditCard(
   return ConvertUTF8ToJavaString(env, card.guid());
 }
 
-void PersonalDataManagerAndroid::UpdateServerCardBillingAddress(
+void PersonalDataManagerAndroid::UpdateServerCardMetadata(
     JNIEnv* env,
     const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jcard_server_id,
-    const JavaParamRef<jstring>& jbilling_address_id) {
-  CreditCard card("", kSettingsOrigin);
-  card.set_record_type(CreditCard::MASKED_SERVER_CARD);
-  card.set_server_id(ConvertJavaStringToUTF8(env, jcard_server_id));
-  card.set_billing_address_id(ConvertJavaStringToUTF8(env,
-      jbilling_address_id));
-  personal_data_manager_->UpdateServerCardBillingAddress(card);
+    const JavaParamRef<jobject>& jcard) {
+  CreditCard card;
+  PopulateNativeCreditCardFromJava(jcard, env, &card);
+
+  personal_data_manager_->UpdateServerCardMetadata(card);
 }
 
 ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::GetBasicCardPaymentType(
@@ -661,8 +658,12 @@ void PersonalDataManagerAndroid::RecordAndLogCreditCardUse(
     const JavaParamRef<jstring>& jguid) {
   CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
       ConvertJavaStringToUTF8(env, jguid));
-  if (card)
+  if (card) {
     personal_data_manager_->RecordUseOf(*card);
+    LOG(ERROR) << "Got the card";

[please use gerrit instead, 2017/01/12 20:57:04]

remove logs

[sebsg, 2017/01/12 21:12:42]

Done.

+  } else {
+    LOG(ERROR) << "didn't get the card";
+  }
 }
 
 void PersonalDataManagerAndroid::SetCreditCardUseStatsForTesting(