[autofill] Sync server card and address metadata.

components/autofill/core/browser/credit_card.h

Index: components/autofill/core/browser/credit_card.h
diff --git a/components/autofill/core/browser/credit_card.h b/components/autofill/core/browser/credit_card.h
index 2a6990a387d4f20cf991527901750f89cb204d33..c75cae37349ea983160814963596717a4fe9bc19 100644
--- a/components/autofill/core/browser/credit_card.h
+++ b/components/autofill/core/browser/credit_card.h
@@ -46,7 +46,7 @@ class CreditCard : public AutofillDataModel {
              int expiration_year);
 
   // Creates a server card.  The type must be MASKED_SERVER_CARD or
-  // FULL_SERVER_CARD.
+  // FULL_SERVER_CARD. |server_id| should not be empty.
   CreditCard(RecordType type, const std::string& server_id);
 
   // For use in STL containers.
@@ -123,8 +123,6 @@ class CreditCard : public AutofillDataModel {
   void SetExpirationMonth(int expiration_month);
   void SetExpirationYear(int expiration_year);
 
-  const std::string& server_id() const { return server_id_; }
-
   // For use in STL containers.
   void operator=(const CreditCard& credit_card);
 
@@ -217,10 +215,6 @@ class CreditCard : public AutofillDataModel {
   int expiration_month_;
   int expiration_year_;
 
-  // For server cards (both MASKED and UNMASKED) this is the ID assigned by the
-  // server to uniquely identify this card.
-  std::string server_id_;
-
   // The status of the card, as reported by the server. Not valid for local
   // cards.
   ServerStatus server_status_;