[Merge M60][Payments] Refactor the year and month combobox models and preselect.

components/autofill/core/browser/validation.cc

Index: components/autofill/core/browser/validation.cc
diff --git a/components/autofill/core/browser/validation.cc b/components/autofill/core/browser/validation.cc
index a2d3e25f945b343841b73cb6eae677b72c93e358..4588a13bbd92d659801ac7afd5431294114aff91 100644
--- a/components/autofill/core/browser/validation.cc
+++ b/components/autofill/core/browser/validation.cc
@@ -154,11 +154,11 @@ CreditCardCompletionStatus GetCompletionStatusForCard(
 
 base::string16 GetCompletionMessageForCard(CreditCardCompletionStatus status) {
   switch (status) {
+    // No message is shown for complete or expired card (which will be fixable)
+    // in the CVC screen.
     case CREDIT_CARD_COMPLETE:
-      return base::string16();
     case CREDIT_CARD_EXPIRED:
-      return l10n_util::GetStringUTF16(
-          IDS_PAYMENTS_VALIDATION_INVALID_CREDIT_CARD_EXPIRED);
+      return base::string16();
     case CREDIT_CARD_NO_CARDHOLDER:
       return l10n_util::GetStringUTF16(IDS_PAYMENTS_NAME_ON_CARD_REQUIRED);
     case CREDIT_CARD_NO_NUMBER: