Handle expired Autofill credit cards in autofill dialog

BUG=168680,235270

Review URL: https://chromiumcodereview.appspot.com/14425010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198063 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 43 insertions, 31 deletions

diff --git a/components/autofill/browser/wallet/full_wallet_unittest.cc b/components/autofill/browser/wallet/full_wallet_unittest.cc
index f322933..9ab93a0 100644
--- a/components/autofill/browser/wallet/full_wallet_unittest.cc
+++ b/components/autofill/browser/wallet/full_wallet_unittest.cc
@@ -18,7 +18,7 @@ namespace {
 const char kFullWalletValidResponse[] =
     "{"
     "  \"expiration_month\":12,"
-    "  \"expiration_year\":2012,"
+    "  \"expiration_year\":3000,"
     "  \"iin\":\"iin\","
     "  \"rest\":\"rest\","
     "  \"billing_address\":"
@@ -35,7 +35,7 @@ const char kFullWalletValidResponse[] =
     "      \"locality_name\":\"locality_name\","
     "      \"administrative_area_name\":\"admin_area_name\","
     "      \"postal_code_number\":\"postal_code_number\","
-    "      \"country_name_code\":\"country_name_code\""
+    "      \"country_name_code\":\"US\""
     "    }"
     "  },"
     "  \"shipping_address\":"
@@ -53,7 +53,7 @@ const char kFullWalletValidResponse[] =
     "      \"locality_name\":\"ship_locality_name\","
     "      \"administrative_area_name\":\"ship_admin_area_name\","
     "      \"postal_code_number\":\"ship_postal_code_number\","
-    "      \"country_name_code\":\"ship_country_name_code\""
+    "      \"country_name_code\":\"US\""
     "    }"
     "  },"
     "  \"required_action\":"
@@ -430,7 +430,7 @@ TEST_F(FullWalletTest, CreateFullWallet) {
   SetUpDictionary(kFullWalletValidResponse);
   std::vector<RequiredAction> required_actions;
   FullWallet full_wallet(12,
-                         2012,
+                         3000,
                          "iin",
                          "rest",
                          GetTestAddress(),
diff --git a/components/autofill/browser/wallet/instrument_unittest.cc b/components/autofill/browser/wallet/instrument_unittest.cc
index 382ef03..23bbfa7 100644
--- a/components/autofill/browser/wallet/instrument_unittest.cc
+++ b/components/autofill/browser/wallet/instrument_unittest.cc
@@ -160,8 +160,7 @@ TEST(Instrument, ToDictionary) {
   expected.SetInteger("credit_card.exp_year", 2015);
   expected.SetString("credit_card.last_4_digits", kLastFourDigits);
   expected.SetString("credit_card.fop_type", "VISA");
-  expected.SetString("credit_card.address.country_name_code",
-                     "ship_country_name_code");
+  expected.SetString("credit_card.address.country_name_code", "US");
   expected.SetString("credit_card.address.recipient_name",
                      "ship_recipient_name");
   expected.SetString("credit_card.address.locality_name",
diff --git a/components/autofill/browser/wallet/wallet_client_unittest.cc b/components/autofill/browser/wallet/wallet_client_unittest.cc
index 5d63ba4..867f3a0 100644
--- a/components/autofill/browser/wallet/wallet_client_unittest.cc
+++ b/components/autofill/browser/wallet/wallet_client_unittest.cc
@@ -40,7 +40,7 @@ const char kMerchantUrl[] = "https://example.com/path?key=value";
 const char kGetFullWalletValidResponse[] =
     "{"
     "  \"expiration_month\":12,"
-    "  \"expiration_year\":2012,"
+    "  \"expiration_year\":3000,"
     "  \"iin\":\"iin\","
     "  \"rest\":\"rest\","
     "  \"billing_address\":"
@@ -58,7 +58,7 @@ const char kGetFullWalletValidResponse[] =
     "      \"locality_name\":\"locality_name\","
     "      \"administrative_area_name\":\"administrative_area_name\","
     "      \"postal_code_number\":\"postal_code_number\","
-    "      \"country_name_code\":\"country_name_code\""
+    "      \"country_name_code\":\"US\""
     "    }"
     "  },"
     "  \"shipping_address\":"
@@ -76,7 +76,7 @@ const char kGetFullWalletValidResponse[] =
     "      \"locality_name\":\"ship_locality_name\","
     "      \"administrative_area_name\":\"ship_administrative_area_name\","
     "      \"postal_code_number\":\"ship_postal_code_number\","
-    "      \"country_name_code\":\"ship_country_name_code\""
+    "      \"country_name_code\":\"US\""
     "    }"
     "  },"
     "  \"required_action\":"
@@ -101,9 +101,9 @@ const char kGetWalletItemsValidResponse[] =
     "      \"descriptive_name\":\"descriptive_name\","
     "      \"type\":\"VISA\","
     "      \"supported_currency\":\"currency_code\","
-    "      \"last_four_digits\":\"last_four_digits\","
+    "      \"last_four_digits\":\"4111\","
     "      \"expiration_month\":12,"
-    "      \"expiration_year\":2012,"
+    "      \"expiration_year\":3000,"
     "      \"brand\":\"monkeys\","
     "      \"billing_address\":"
     "      {"
@@ -353,7 +353,7 @@ const char kSaveAddressValidRequest[] =
                     "\"save_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
-                "\"country_name_code\":\"save_country_name_code\","
+                "\"country_name_code\":\"US\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
                 "\"recipient_name\":\"save_recipient_name\""
@@ -375,13 +375,13 @@ const char kSaveInstrumentValidRequest[] =
                         "\"address_line_2\""
                     "],"
                     "\"administrative_area_name\":\"admin_area_name\","
-                    "\"country_name_code\":\"country_name_code\","
+                    "\"country_name_code\":\"US\","
                     "\"locality_name\":\"locality_name\","
                     "\"postal_code_number\":\"postal_code_number\","
                     "\"recipient_name\":\"recipient_name\""
                 "},"
                 "\"exp_month\":12,"
-                "\"exp_year\":2012,"
+                "\"exp_year\":3000,"
                 "\"fop_type\":\"VISA\","
                 "\"last_4_digits\":\"4448\""
             "},"
@@ -407,13 +407,13 @@ const char kSaveInstrumentAndAddressValidRequest[] =
                         "\"address_line_2\""
                     "],"
                     "\"administrative_area_name\":\"admin_area_name\","
-                    "\"country_name_code\":\"country_name_code\","
+                    "\"country_name_code\":\"US\","
                     "\"locality_name\":\"locality_name\","
                     "\"postal_code_number\":\"postal_code_number\","
                     "\"recipient_name\":\"recipient_name\""
                 "},"
                 "\"exp_month\":12,"
-                "\"exp_year\":2012,"
+                "\"exp_year\":3000,"
                 "\"fop_type\":\"VISA\","
                 "\"last_4_digits\":\"4448\""
             "},"
@@ -434,7 +434,7 @@ const char kSaveInstrumentAndAddressValidRequest[] =
                     "\"save_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
-                "\"country_name_code\":\"save_country_name_code\","
+                "\"country_name_code\":\"US\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
                 "\"recipient_name\":\"save_recipient_name\""
@@ -473,7 +473,7 @@ const char kUpdateAddressValidRequest[] =
                     "\"ship_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"ship_admin_area_name\","
-                "\"country_name_code\":\"ship_country_name_code\","
+                "\"country_name_code\":\"US\","
                 "\"locality_name\":\"ship_locality_name\","
                 "\"postal_code_number\":\"ship_postal_code_number\","
                 "\"recipient_name\":\"ship_recipient_name\""
@@ -494,7 +494,7 @@ const char kUpdateInstrumentAddressValidRequest[] =
                 "\"address_line_2\""
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
-            "\"country_name_code\":\"country_name_code\","
+            "\"country_name_code\":\"US\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
             "\"recipient_name\":\"recipient_name\""
@@ -516,7 +516,7 @@ const char kUpdateInstrumentAddressWithNameChangeValidRequest[] =
                 "\"address_line_2\""
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
-            "\"country_name_code\":\"country_name_code\","
+            "\"country_name_code\":\"US\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
             "\"recipient_name\":\"recipient_name\""
@@ -546,7 +546,7 @@ const char kUpdateInstrumentAddressAndExpirationDateValidRequest[] =
                 "\"address_line_2\""
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
-            "\"country_name_code\":\"country_name_code\","
+            "\"country_name_code\":\"US\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
             "\"recipient_name\":\"recipient_name\""
diff --git a/components/autofill/browser/wallet/wallet_items.h b/components/autofill/browser/wallet/wallet_items.h
index 80610fa..14c4521 100644
--- a/components/autofill/browser/wallet/wallet_items.h
+++ b/components/autofill/browser/wallet/wallet_items.h
@@ -29,6 +29,8 @@ class Image;
 namespace autofill {
 
 FORWARD_DECLARE_TEST(WalletInstrumentWrapperTest, GetInfoCreditCardExpMonth);
+FORWARD_DECLARE_TEST(WalletInstrumentWrapperTest,
+                     GetDisplayTextEmptyWhenExpired);
 
 namespace wallet {
 
@@ -110,6 +112,8 @@ class WalletItems {
         const std::string&);
     FRIEND_TEST_ALL_PREFIXES(::autofill::WalletInstrumentWrapperTest,
                              GetInfoCreditCardExpMonth);
+    FRIEND_TEST_ALL_PREFIXES(::autofill::WalletInstrumentWrapperTest,
+                             GetDisplayTextEmptyWhenExpired);
     FRIEND_TEST_ALL_PREFIXES(WalletItemsTest, CreateMaskedInstrument);
     FRIEND_TEST_ALL_PREFIXES(WalletItemsTest, CreateWalletItems);
 
diff --git a/components/autofill/browser/wallet/wallet_test_util.cc b/components/autofill/browser/wallet/wallet_test_util.cc
index f95fa0d..f34e82a 100644
--- a/components/autofill/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/browser/wallet/wallet_test_util.cc
@@ -19,22 +19,31 @@
 namespace autofill {
 namespace wallet {
 
+namespace {
+
+int FutureYear() {
+  // "In the Year 3000." - Richie "LaBamba" Rosenberg
+  return 3000;
+}
+
+}  // namespace
+
 scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithId(
     const std::string& id) {
   return scoped_ptr<WalletItems::MaskedInstrument>(
       new WalletItems::MaskedInstrument(ASCIIToUTF16("descriptive_name"),
-                                        WalletItems::MaskedInstrument::UNKNOWN,
+                                        WalletItems::MaskedInstrument::VISA,
                                         std::vector<base::string16>(),
-                                        ASCIIToUTF16("last_four_digits"),
+                                        ASCIIToUTF16("1111"),
                                         12,
-                                        2012,
+                                        FutureYear(),
                                         GetTestAddress(),
-                                        WalletItems::MaskedInstrument::EXPIRED,
+                                        WalletItems::MaskedInstrument::VALID,
                                         id));
 }
 
 scoped_ptr<Address> GetTestAddress() {
-  return scoped_ptr<Address>(new Address("country_name_code",
+  return scoped_ptr<Address>(new Address("US",
                                          ASCIIToUTF16("recipient_name"),
                                          ASCIIToUTF16("address_line_1"),
                                          ASCIIToUTF16("address_line_2"),
@@ -48,8 +57,8 @@ scoped_ptr<Address> GetTestAddress() {
 scoped_ptr<FullWallet> GetTestFullWallet() {
   base::Time::Exploded exploded;
   base::Time::Now().LocalExplode(&exploded);
-  return scoped_ptr<FullWallet>(new FullWallet(exploded.year + 3,
-                                               exploded.month,
+  return scoped_ptr<FullWallet>(new FullWallet(FutureYear(),
+                                               12,
                                                "iin",
                                                "rest",
                                                GetTestAddress(),
@@ -61,7 +70,7 @@ scoped_ptr<Instrument> GetTestInstrument() {
   return scoped_ptr<Instrument>(new Instrument(ASCIIToUTF16("4444444444444448"),
                                                ASCIIToUTF16("123"),
                                                12,
-                                               2012,
+                                               FutureYear(),
                                                Instrument::VISA,
                                                GetTestAddress()));
 }
@@ -83,7 +92,7 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestNonDefaultMaskedInstrument() {
 
 scoped_ptr<Address> GetTestSaveableAddress() {
   return scoped_ptr<Address>(new Address(
-      "save_country_name_code",
+      "US",
       ASCIIToUTF16("save_recipient_name"),
       ASCIIToUTF16("save_address_line_1"),
       ASCIIToUTF16("save_address_line_2"),
@@ -96,7 +105,7 @@ scoped_ptr<Address> GetTestSaveableAddress() {
 
 scoped_ptr<Address> GetTestShippingAddress() {
   return scoped_ptr<Address>(new Address(
-      "ship_country_name_code",
+      "US",
       ASCIIToUTF16("ship_recipient_name"),
       ASCIIToUTF16("ship_address_line_1"),
       ASCIIToUTF16("ship_address_line_2"),