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

components/autofill/core/browser/validation.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/validation.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 136 matching lines @@
       !autofill::PersonalDataManager::GetProfileFromProfilesByGUID(
           card.billing_address_id(), billing_addresses)) {
     status |= CREDIT_CARD_NO_BILLING_ADDRESS;
   }
 
   return status;
 }
 
 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:
+    case CREDIT_CARD_EXPIRED:
       return base::string16();
-    case CREDIT_CARD_EXPIRED:
-      return l10n_util::GetStringUTF16(
-          IDS_PAYMENTS_VALIDATION_INVALID_CREDIT_CARD_EXPIRED);
     case CREDIT_CARD_NO_CARDHOLDER:
       return l10n_util::GetStringUTF16(IDS_PAYMENTS_NAME_ON_CARD_REQUIRED);
     case CREDIT_CARD_NO_NUMBER:
       return l10n_util::GetStringUTF16(
           IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE);
     case CREDIT_CARD_NO_BILLING_ADDRESS:
       return l10n_util::GetStringUTF16(
           IDS_PAYMENTS_CARD_BILLING_ADDRESS_REQUIRED);
     default:
       // Multiple things are missing
@@ skipping 204 matching lines @@
     return AMEX_CVC_LENGTH;
 
   return GENERAL_CVC_LENGTH;
 }
 
 bool IsUPIVirtualPaymentAddress(const base::string16& value) {
   return MatchesPattern(value, base::ASCIIToUTF16(kUPIVirtualPaymentAddressRe));
 }
 
 }  // namespace autofill