[autofill] Sync server card and address metadata.

components/autofill/core/browser/credit_card.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/credit_card.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
@@ skipping 84 matching lines @@
   SetExpirationMonth(expiration_month);
   SetExpirationYear(expiration_year);
 }
 
 CreditCard::CreditCard(RecordType type, const std::string& server_id)
     : AutofillDataModel(base::GenerateGUID(), std::string()),
       record_type_(type),
       type_(kGenericCard),
       expiration_month_(0),
       expiration_year_(0),
-      server_id_(server_id),
       server_status_(OK) {
   DCHECK(type == MASKED_SERVER_CARD || type == FULL_SERVER_CARD);
+  DCHECK(!server_id.empty());
+  set_server_id(server_id);
 }
 
 CreditCard::CreditCard()
     : AutofillDataModel(base::GenerateGUID(), std::string()),
       record_type_(LOCAL_CARD),
       type_(kGenericCard),
       expiration_month_(0),
       expiration_year_(0),
       server_status_(OK) {
 }
@@ skipping 377 matching lines @@
   if (digits.empty())
     return type;
 
   // The separator character is a non breaking space and a horizontal midline
   // ellipsis.
   // TODO(estade): i18n?
   return type + base::UTF8ToUTF16("\xC2\xA0\xE2\x8B\xAF") + digits;
 }
 
 void CreditCard::operator=(const CreditCard& credit_card) {
+  set_server_id(credit_card.server_id());
   set_use_count(credit_card.use_count());
   set_use_date(credit_card.use_date());
   set_modification_date(credit_card.modification_date());
 
   if (this == &credit_card)
     return;
 
   record_type_ = credit_card.record_type_;
   number_ = credit_card.number_;
   name_on_card_ = credit_card.name_on_card_;
   type_ = credit_card.type_;
   expiration_month_ = credit_card.expiration_month_;
   expiration_year_ = credit_card.expiration_year_;
-  server_id_ = credit_card.server_id_;
   server_status_ = credit_card.server_status_;
 
   set_guid(credit_card.guid());
   set_origin(credit_card.origin());
 }
 
 bool CreditCard::UpdateFromImportedCard(const CreditCard& imported_card,
                                         const std::string& app_locale) {
   if (this->GetInfo(AutofillType(CREDIT_CARD_NUMBER), app_locale) !=
           imported_card.GetInfo(AutofillType(CREDIT_CARD_NUMBER), app_locale)) {
@@ skipping 31 matching lines @@
                                     CREDIT_CARD_NUMBER,
                                     CREDIT_CARD_EXP_MONTH,
                                     CREDIT_CARD_EXP_4_DIGIT_YEAR };
   for (size_t i = 0; i < arraysize(types); ++i) {
     int comparison =
         GetRawInfo(types[i]).compare(credit_card.GetRawInfo(types[i]));
     if (comparison != 0)
       return comparison;
   }
 
-  int comparison = server_id_.compare(credit_card.server_id_);
+  int comparison = server_id().compare(credit_card.server_id());
   if (comparison != 0)
     return comparison;
 
   if (static_cast<int>(server_status_) <
       static_cast<int>(credit_card.server_status_))
     return -1;
   if (static_cast<int>(server_status_) >
       static_cast<int>(credit_card.server_status_))
     return 1;
   if (static_cast<int>(record_type_) <
@@ skipping 202 matching lines @@
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kUnionPay = "unionPayCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill