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

components/payments/core/autofill_payment_instrument.cc

Index: components/payments/core/autofill_payment_instrument.cc
diff --git a/components/payments/core/autofill_payment_instrument.cc b/components/payments/core/autofill_payment_instrument.cc
index 75c44845c1de1c5570b40ec9543b303038b29e5d..82ff24d2c6288af7b1e9e2c8e44fbc8528e41916 100644
--- a/components/payments/core/autofill_payment_instrument.cc
+++ b/components/payments/core/autofill_payment_instrument.cc
@@ -78,9 +78,11 @@ void AutofillPaymentInstrument::InvokePaymentApp(
 }
 
 bool AutofillPaymentInstrument::IsCompleteForPayment() {
+  // COMPLETE or EXPIRED cards are considered valid for payment. The user will
+  // be prompted to enter the new expiration at the CVC step.
   return autofill::GetCompletionStatusForCard(credit_card_, app_locale_,
-                                              billing_profiles_) ==
-         autofill::CREDIT_CARD_COMPLETE;
+                                              billing_profiles_) <=
+         autofill::CREDIT_CARD_EXPIRED;
 }
 
 base::string16 AutofillPaymentInstrument::GetMissingInfoLabel() {