[Autofill] Improve support for various credit card expiration dates.

components/autofill/core/browser/validation_unittest.cc

Index: components/autofill/core/browser/validation_unittest.cc
diff --git a/components/autofill/core/browser/validation_unittest.cc b/components/autofill/core/browser/validation_unittest.cc
index 0312a7d7fef57e0af64de3c39fdf47d818035234..11dc379d7f93b5183f55cf25e513f353b0e4aa51 100644
--- a/components/autofill/core/browser/validation_unittest.cc
+++ b/components/autofill/core/browser/validation_unittest.cc
@@ -55,24 +55,11 @@ const char* const kInvalidNumbers[] = {
   "3056 9309 0259 04aa", /* non-digit characters */
 };
 const char kCurrentDate[]="1 May 2013";
-const ExpirationDate kValidCreditCardExpirationDate[] = {
-  { "2013", "5" },  // Valid month in current year.
-  { "2014", "1" },  // Any month in next year.
-  { "2014", "12" },  // Edge condition.
-  { "2014", " 1" },  // Whitespace in month.
-  { " 2014", "1" },  // Whitespace in year.
-};
 const IntExpirationDate kValidCreditCardIntExpirationDate[] = {
   { 2013, 5 },  // Valid month in current year.
   { 2014, 1 },  // Any month in next year.
   { 2014, 12 },  // Edge condition.
 };
-const ExpirationDate kInvalidCreditCardExpirationDate[] = {
-  { "2013", "04" },  // Previous month in current year.
-  { "2012", "12" },  // Any month in previous year.
-  { "2015", "13" },  // Not a real month.
-  { "2015", "00" },  // Zero is legal in the CC class but is not a valid date.
-};
 const IntExpirationDate kInvalidCreditCardIntExpirationDate[] = {
   { 2013, 4 },  // Previous month in current year.
   { 2012, 12 },  // Any month in previous year.
@@ -118,28 +105,6 @@ TEST(AutofillValidation, IsValidCreditCardNumber) {
   }
 }
 
-TEST(AutofillValidation, IsValidCreditCardExpirationDate) {
-  base::Time now;
-  ASSERT_TRUE(base::Time::FromString(kCurrentDate, &now));
-
-  for (size_t i = 0; i < arraysize(kValidCreditCardExpirationDate); ++i) {
-    const ExpirationDate& data = kValidCreditCardExpirationDate[i];
-    SCOPED_TRACE(data.year);
-    SCOPED_TRACE(data.month);
-    EXPECT_TRUE(IsValidCreditCardExpirationDate(ASCIIToUTF16(data.year),
-                                                ASCIIToUTF16(data.month),
-                                                now));
-  }
-  for (size_t i = 0; i < arraysize(kInvalidCreditCardExpirationDate); ++i) {
-    const ExpirationDate& data = kInvalidCreditCardExpirationDate[i];
-    SCOPED_TRACE(data.year);
-    SCOPED_TRACE(data.month);
-    EXPECT_TRUE(!IsValidCreditCardExpirationDate(ASCIIToUTF16(data.year),
-                                                 ASCIIToUTF16(data.month),
-                                                 now));
-  }
-}
-
 TEST(AutofillValidation, IsValidCreditCardIntExpirationDate) {
   base::Time now;
   ASSERT_TRUE(base::Time::FromString(kCurrentDate, &now));