[autofill] Sync server card and address metadata.

components/autofill/core/browser/credit_card.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
 
 #include <iosfwd>
 #include <string>
 #include <utility>
@@ skipping 28 matching lines @@
     EXPIRED,
     OK,
   };
 
   CreditCard(const std::string& guid, const std::string& origin);
   CreditCard(const base::string16& card_number,
              int expiration_month,
              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.
   CreditCard();
   CreditCard(const CreditCard& credit_card);
   ~CreditCard() override;
 
   // Returns a version of |number| that has any separator characters removed.
   static const base::string16 StripSeparators(const base::string16& number);
 
@@ skipping 56 matching lines @@
 
   int expiration_month() const { return expiration_month_; }
   int expiration_year() const { return expiration_year_; }
 
   // These setters verify that the month and year are within appropriate
   // ranges, or 0. They take integers as an alternative to setting the inputs
   // from strings via SetInfo().
   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);
 
   // If the card numbers for |this| and |imported_card| match, and merging the
   // two wouldn't result in unverified data overwriting verified data,
   // overwrites |this| card's data with the data in |credit_card|.
   // Returns true if the card numbers match, false otherwise.
   bool UpdateFromImportedCard(const CreditCard& imported_card,
                               const std::string& app_locale) WARN_UNUSED_RESULT;
 
@@ skipping 72 matching lines @@
   // The cardholder's name. May be empty.
   base::string16 name_on_card_;
 
   // The type of the card. This is one of the k...Card constants below.
   std::string type_;
 
   // These members are zero if not present.
   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_;
 };
 
 // So we can compare CreditCards with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card);
 
 // The string identifiers for credit card icon resources.
 extern const char* const kAmericanExpressCard;
 extern const char* const kDinersCard;
 extern const char* const kDiscoverCard;
 extern const char* const kGenericCard;
 extern const char* const kJCBCard;
 extern const char* const kMasterCard;
 extern const char* const kUnionPay;
 extern const char* const kVisaCard;
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_