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

components/payments/core/autofill_payment_instrument.cc

 // Copyright 2017 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/payments/core/autofill_payment_instrument.h"
 
 #include <memory>
 
 #include "base/json/json_writer.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 60 matching lines @@
     country_code = autofill::AutofillCountry::CountryCodeForLocale(app_locale_);
   }
   payment_request_delegate_->GetAddressNormalizer()->StartAddressNormalization(
       billing_address_, country_code, /*timeout_seconds=*/5, this);
 
   payment_request_delegate_->DoFullCardRequest(credit_card_,
                                                weak_ptr_factory_.GetWeakPtr());
 }
 
 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() {
   return autofill::GetCompletionMessageForCard(
       autofill::GetCompletionStatusForCard(credit_card_, app_locale_,
                                            billing_profiles_));
 }
 
 bool AutofillPaymentInstrument::IsValidForCanMakePayment() {
   autofill::CreditCardCompletionStatus status =
@@ skipping 68 matching lines @@
           .ToDictionaryValue();
   std::string stringified_details;
   base::JSONWriter::Write(*response_value, &stringified_details);
   delegate_->OnInstrumentDetailsReady(method_name(), stringified_details);
 
   delegate_ = nullptr;
   cvc_ = base::UTF8ToUTF16("");
 }
 
 }  // namespace payments