Add billing address to masked server credit cards.

components/autofill/core/browser/personal_data_manager.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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <list>
 #include <map>
@@ skipping 567 matching lines @@
   if (existing_credit_card->record_type() == CreditCard::MASKED_SERVER_CARD) {
     database_->UnmaskServerCreditCard(credit_card,
                                       credit_card.number());
   } else {
     database_->MaskServerCreditCard(credit_card.server_id());
   }
 
   Refresh();
 }
 
+void PersonalDataManager::UpdateServerCardBillingAddress(
+    const CreditCard& credit_card) {
+  DCHECK_NE(CreditCard::LOCAL_CARD, credit_card.record_type());
+
+  if (!database_.get())
+    return;
+
+  CreditCard* existing_credit_card = nullptr;
+  for (auto it : server_credit_cards_) {
+    if (credit_card.guid() == it->guid()) {
+      existing_credit_card = it;
+      break;
+    }
+  }
+  if (!existing_credit_card
+      || existing_credit_card->billing_address_id() ==
+          credit_card.billing_address_id()) {
+    return;
+  }
+
+  existing_credit_card->set_billing_address_id(
+      credit_card.billing_address_id());
+  database_->UpdateServerCardBillingAddress(*existing_credit_card);
+
+  Refresh();
+}
+
 void PersonalDataManager::ResetFullServerCard(const std::string& guid) {
   for (const CreditCard* card : server_credit_cards_) {
     if (card->guid() == guid) {
       DCHECK_EQ(card->record_type(), CreditCard::FULL_SERVER_CARD);
       CreditCard card_copy = *card;
       card_copy.set_record_type(CreditCard::MASKED_SERVER_CARD);
       card_copy.SetNumber(card->LastFourDigits());
       UpdateServerCreditCard(card_copy);
       break;
     }
@@ skipping 1087 matching lines @@
         if (profile_to_merge->IsVerified())
           break;
       }
     }
   }
   AutofillMetrics::LogNumberOfProfilesRemovedDuringDedupe(
       profiles_to_delete->size());
 }
 
 }  // namespace autofill