Use server ID to identify server 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 613 matching lines @@
 
 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* server_card : server_credit_cards_) {
-    if (credit_card.guid() == server_card->guid()) {
+    if (credit_card.server_id() == server_card->server_id()) {
       existing_credit_card = server_card;
       break;
     }
   }
   if (!existing_credit_card
       || existing_credit_card->billing_address_id() ==
           credit_card.billing_address_id()) {
     return;
   }
 
@@ skipping 1110 matching lines @@
         if (profile_to_merge->IsVerified())
           break;
       }
     }
   }
   AutofillMetrics::LogNumberOfProfilesRemovedDuringDedupe(
       profiles_to_delete->size());
 }
 
 }  // namespace autofill