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

components/payments/core/autofill_payment_instrument_unittest.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 "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 152 matching lines @@
 };
 
 // A valid local credit card is a valid instrument for payment.
 TEST_F(AutofillPaymentInstrumentTest, IsCompleteForPayment) {
   AutofillPaymentInstrument instrument("visa", local_credit_card(),
                                        billing_profiles(), "en-US", nullptr);
   EXPECT_TRUE(instrument.IsCompleteForPayment());
   EXPECT_TRUE(instrument.GetMissingInfoLabel().empty());
 }
 
-// An expired local card is not a valid instrument for payment.
+// An expired local card is still a valid instrument for payment.
 TEST_F(AutofillPaymentInstrumentTest, IsCompleteForPayment_Expired) {
   autofill::CreditCard& card = local_credit_card();
   card.SetExpirationYear(2016);  // Expired.
   AutofillPaymentInstrument instrument("visa", card, billing_profiles(),
                                        "en-US", nullptr);
-  EXPECT_FALSE(instrument.IsCompleteForPayment());
-  EXPECT_EQ(l10n_util::GetStringUTF16(
-                IDS_PAYMENTS_VALIDATION_INVALID_CREDIT_CARD_EXPIRED),
-            instrument.GetMissingInfoLabel());
+  EXPECT_TRUE(instrument.IsCompleteForPayment());
+  EXPECT_EQ(base::string16(), instrument.GetMissingInfoLabel());
 }
 
 // A local card with no name is not a valid instrument for payment.
 TEST_F(AutofillPaymentInstrumentTest, IsCompleteForPayment_NoName) {
   autofill::CreditCard& card = local_credit_card();
   card.SetInfo(autofill::AutofillType(autofill::CREDIT_CARD_NAME_FULL),
                base::ASCIIToUTF16(""), "en-US");
   base::string16 missing_info;
   AutofillPaymentInstrument instrument("visa", card, billing_profiles(),
                                        "en-US", nullptr);
@@ skipping 63 matching lines @@
 TEST_F(AutofillPaymentInstrumentTest, IsCompleteForPayment_MaskedCard) {
   autofill::CreditCard card = autofill::test::GetMaskedServerCard();
   ASSERT_GT(billing_profiles().size(), 0UL);
   card.set_billing_address_id(billing_profiles()[0]->guid());
   AutofillPaymentInstrument instrument("visa", card, billing_profiles(),
                                        "en-US", nullptr);
   EXPECT_TRUE(instrument.IsCompleteForPayment());
   EXPECT_TRUE(instrument.GetMissingInfoLabel().empty());
 }
 
-// An expired masked (server) card is not a valid instrument for payment.
+// An expired masked (server) card is still a valid instrument for payment.
 TEST_F(AutofillPaymentInstrumentTest, IsCompleteForPayment_ExpiredMaskedCard) {
   autofill::CreditCard card = autofill::test::GetMaskedServerCard();
   ASSERT_GT(billing_profiles().size(), 0UL);
   card.set_billing_address_id(billing_profiles()[0]->guid());
   card.SetExpirationYear(2016);  // Expired.
   AutofillPaymentInstrument instrument("visa", card, billing_profiles(),
                                        "en-US", nullptr);
-  EXPECT_FALSE(instrument.IsCompleteForPayment());
-  EXPECT_EQ(l10n_util::GetStringUTF16(
-                IDS_PAYMENTS_VALIDATION_INVALID_CREDIT_CARD_EXPIRED),
-            instrument.GetMissingInfoLabel());
+  EXPECT_TRUE(instrument.IsCompleteForPayment());
+  EXPECT_EQ(base::string16(), instrument.GetMissingInfoLabel());
 }
 
 // An expired card is a valid instrument for canMakePayment.
 TEST_F(AutofillPaymentInstrumentTest, IsValidForCanMakePayment_Minimal) {
   autofill::CreditCard& card = local_credit_card();
   card.SetExpirationYear(2016);  // Expired.
   AutofillPaymentInstrument instrument("visa", card, billing_profiles(),
                                        "en-US", nullptr);
   EXPECT_TRUE(instrument.IsValidForCanMakePayment());
 }
@@ skipping 76 matching lines @@
   delegate.CompleteFullCardRequest();
   EXPECT_FALSE(instrument_delegate.WasOnInstrumentDetailsReadyCalled());
   EXPECT_FALSE(instrument_delegate.WasOnInstrumentDetailsErrorCalled());
 
   delegate.test_address_normalizer()->CompleteAddressNormalization();
   EXPECT_TRUE(instrument_delegate.WasOnInstrumentDetailsReadyCalled());
   EXPECT_FALSE(instrument_delegate.WasOnInstrumentDetailsErrorCalled());
 }
 
 }  // namespace payments