Add status to server credit cards.

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 114 matching lines @@
   return base::string16();
 }
 
 }  // namespace
 
 CreditCard::CreditCard(const std::string& guid, const std::string& origin)
     : AutofillDataModel(guid, origin),
       record_type_(LOCAL_CARD),
       type_(kGenericCard),
       expiration_month_(0),
-      expiration_year_(0) {
+      expiration_year_(0),
+      server_status_(OK) {
 }
 
 CreditCard::CreditCard(const base::string16& card_number,
                        int expiration_month,
                        int expiration_year)
     : AutofillDataModel(std::string(), std::string()),
-      record_type_(LOCAL_CARD) {
+      record_type_(LOCAL_CARD),
+      server_status_(OK) {
   SetNumber(card_number);
   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_id_(server_id),
+      server_status_(OK) {
   DCHECK(type == MASKED_SERVER_CARD || type == FULL_SERVER_CARD);
 }
 
 CreditCard::CreditCard()
     : AutofillDataModel(base::GenerateGUID(), std::string()),
       record_type_(LOCAL_CARD),
       type_(kGenericCard),
       expiration_month_(0),
-      expiration_year_(0) {
+      expiration_year_(0),
+      server_status_(OK) {
 }
 
 CreditCard::CreditCard(const CreditCard& credit_card)
     : AutofillDataModel(std::string(), std::string()) {
   operator=(credit_card);
 }
 
 CreditCard::~CreditCard() {}
 
 // static
@@ skipping 126 matching lines @@
     return kDiscoverCard;
 
   return kGenericCard;
 }
 
 void CreditCard::SetTypeForMaskedCard(const char* type) {
   DCHECK_EQ(MASKED_SERVER_CARD, record_type());
   type_ = type;
 }
 
+void CreditCard::SetServerStatus(ServerStatus status) {
+  DCHECK_NE(LOCAL_CARD, record_type());
+  server_status_ = status;
+}
+
+CreditCard::ServerStatus CreditCard::GetServerStatus() const {
+  DCHECK_NE(LOCAL_CARD, record_type());
+  return server_status_;
+}
+
 base::string16 CreditCard::GetRawInfo(ServerFieldType type) const {
   DCHECK_EQ(CREDIT_CARD, AutofillType(type).group());
   switch (type) {
     case CREDIT_CARD_NAME:
       return name_on_card_;
 
     case CREDIT_CARD_EXP_MONTH:
       return ExpirationMonthAsString();
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
@@ skipping 198 matching lines @@
   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)) {
     return false;
@@ skipping 34 matching lines @@
     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_);
   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_) <
       static_cast<int>(credit_card.record_type_))
     return -1;
   if (static_cast<int>(record_type_) >
       static_cast<int>(credit_card.record_type_))
     return 1;
   return 0;
 }
 
 bool CreditCard::IsLocalDuplicateOfServerCard(const CreditCard& other) const {
@@ skipping 159 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