Add status to server credit cards.

components/autofill/core/browser/webdata/autofill_table.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/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
@@ skipping 427 matching lines @@
   return reinterpret_cast<void*>(&table_key);
 }
 
 time_t GetEndTime(const base::Time& end) {
   if (end.is_null() || end == base::Time::Max())
     return std::numeric_limits<time_t>::max();
 
   return end.ToTimeT();
 }
 
+std::string ServerStatusEnumToString(CreditCard::ServerStatus status) {
+  switch (status) {
+    case CreditCard::EXPIRED:
+      return "EXPIRED";
+
+    case CreditCard::OK:
+      return "OK";
+  }
+
+  NOTREACHED();
+  return "OK";
+}
+
+CreditCard::ServerStatus ServerStatusStringToEnum(const std::string& status) {
+  if (status == "EXPIRED")
+    return CreditCard::EXPIRED;
+
+  DCHECK_EQ("OK", status);
+  return CreditCard::OK;
+}
+
 }  // namespace
 
 // The maximum length allowed for form data.
 const size_t AutofillTable::kMaxDataLength = 1024;
 
 AutofillTable::AutofillTable(const std::string& app_locale)
     : app_locale_(app_locale) {
 }
 
 AutofillTable::~AutofillTable() {
@@ skipping 764 matching lines @@
                                                       : full_card_number);
     std::string card_type = s.ColumnString(index++);
     if (record_type == CreditCard::MASKED_SERVER_CARD) {
       // The type must be set after setting the number to override the
       // autodectected type.
       card->SetTypeForMaskedCard(card_type.c_str());
     } else {
       DCHECK_EQ(CreditCard::GetCreditCardType(full_card_number), card_type);
     }
 
-    index++;  // TODO(brettw) hook up status. For now, skip over it.
+    card->SetServerStatus(ServerStatusStringToEnum(s.ColumnString(index++)));
     card->SetRawInfo(CREDIT_CARD_NAME, s.ColumnString16(index++));
     card->SetRawInfo(CREDIT_CARD_EXP_MONTH, s.ColumnString16(index++));
     card->SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, s.ColumnString16(index++));
     credit_cards->push_back(card);
   }
 
   static bool do_once = true;
   // Fake out some masked cards. TODO(estade): remove this block of code.
   if (do_once &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 17 matching lines @@
     fake_masked_cards.back().SetRawInfo(CREDIT_CARD_NAME,
                                         ASCIIToUTF16("Elena Salazar"));
     fake_masked_cards.back().SetRawInfo(CREDIT_CARD_EXP_MONTH,
                                         ASCIIToUTF16("05"));
     fake_masked_cards.back().SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                         ASCIIToUTF16("2017"));
     fake_masked_cards.back().SetRawInfo(CREDIT_CARD_NUMBER,
                                         ASCIIToUTF16("9424"));
     fake_masked_cards.back().SetTypeForMaskedCard(kDiscoverCard);
 
+    fake_masked_cards.push_back(
+        CreditCard(CreditCard::MASKED_SERVER_CARD, "c789"));
+    fake_masked_cards.back().SetRawInfo(CREDIT_CARD_NAME,
+                                        ASCIIToUTF16("Efren Salazar, Sr"));
+    fake_masked_cards.back().SetRawInfo(CREDIT_CARD_EXP_MONTH,
+                                        ASCIIToUTF16("12"));
+    fake_masked_cards.back().SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR,
+                                        ASCIIToUTF16("2014"));
+    fake_masked_cards.back().SetRawInfo(CREDIT_CARD_NUMBER,
+                                        ASCIIToUTF16("1881"));
+    fake_masked_cards.back().SetTypeForMaskedCard(kVisaCard);
+    fake_masked_cards.back().SetServerStatus(CreditCard::EXPIRED);
+
     SetServerCreditCards(fake_masked_cards);
     return GetServerCreditCards(credit_cards);
   }
 
   return s.Succeeded();
 }
 
 void AutofillTable::SetServerCreditCards(
     const std::vector<CreditCard>& credit_cards) {
   // Delete all old values.
@@ skipping 39 matching lines @@
   sql::Statement unmasked_insert(db_->GetUniqueStatement(
       "INSERT INTO unmasked_credit_cards("
       "id,"                     // 0
       "card_number_encrypted)"  // 1
       "VALUES (?,?)"));
   for (const CreditCard& card : credit_cards) {
     DCHECK(card.record_type() != CreditCard::LOCAL_CARD);
 
     masked_insert.BindString(0, card.server_id());
     masked_insert.BindString(1, card.type());
-    masked_insert.BindNull(2);  // Skip status which doesn't have storage yet.
+    masked_insert.BindString(2,
+                             ServerStatusEnumToString(card.GetServerStatus()));
     masked_insert.BindString16(3, card.GetRawInfo(CREDIT_CARD_NAME));
     masked_insert.BindString16(4, card.LastFourDigits());
     masked_insert.BindString16(5, card.GetRawInfo(CREDIT_CARD_EXP_MONTH));
     masked_insert.BindString16(6,
                                card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
     masked_insert.Run();
     masked_insert.Reset(true);
 
     if (card.record_type() == CreditCard::FULL_SERVER_CARD) {
@@ skipping 1362 matching lines @@
                       "ADD COLUMN full_name VARCHAR");
 }
 
 bool AutofillTable::MigrateToVersion60AddServerCards() {
   return InitMaskedCreditCardsTable() &&
          InitUnmaskedCreditCardsTable() &&
          InitServerAddressesTable();
 }
 
 }  // namespace autofill