[Autofill] Transfer billing address of server cards when deduping.

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>
@@ skipping 1802 matching lines @@
     const std::unordered_map<std::string, std::string>& guids_merge_map) {
   /*  Here is an example of what the graph might look like.
 
       A -> B
              \
                -> E
              /
       C -> D
   */
 
-  for (auto& credit_card : local_credit_cards_) {
+  for (auto& credit_card : GetCreditCards()) {
     // If the credit card is not associated with a billing address, skip it.
     if (credit_card->billing_address_id().empty())
       break;
 
     // If the billing address profile associated with the card has been merged,
     // replace it by the id of the profile in which it was merged. Repeat the
     // process until the billing address has not been merged into another one.
     std::unordered_map<std::string, std::string>::size_type nb_guid_changes = 0;
     bool was_modified = false;
     auto it = guids_merge_map.find(credit_card->billing_address_id());
     while (it != guids_merge_map.end()) {
       was_modified = true;
       credit_card->set_billing_address_id(it->second);
       it = guids_merge_map.find(credit_card->billing_address_id());
 
       // Out of abundance of caution.
       if (nb_guid_changes > guids_merge_map.size()) {
         NOTREACHED();
         // Cancel the changes for that card.
         was_modified = false;
         break;
       }
     }
 
     // If the card was modified, apply the changes to the database.
     if (was_modified) {
-      database_->UpdateCreditCard(*credit_card);
+      if (credit_card->record_type() == CreditCard::LOCAL_CARD)
+        database_->UpdateCreditCard(*credit_card);
+      else
+        database_->UpdateServerCardMetadata(*credit_card);
     }
   }
 }
 
 }  // namespace autofill