[Payments] Update expired card expiration after unmask.

components/autofill/core/browser/payments/full_card_request_unittest.cc

Index: components/autofill/core/browser/payments/full_card_request_unittest.cc
diff --git a/components/autofill/core/browser/payments/full_card_request_unittest.cc b/components/autofill/core/browser/payments/full_card_request_unittest.cc
index 6fa6a66d9476b4cee5bf17972516daac3b97ea75..b5ea579bbdeb17634904135409c97684cf1c744f 100644
--- a/components/autofill/core/browser/payments/full_card_request_unittest.cc
+++ b/components/autofill/core/browser/payments/full_card_request_unittest.cc
@@ -41,6 +41,7 @@ class MockPersonalDataManager : public PersonalDataManager {
   ~MockPersonalDataManager() override {}
   MOCK_METHOD1(UpdateCreditCard, void(const CreditCard& credit_card));
   MOCK_METHOD1(UpdateServerCreditCard, void(const CreditCard& credit_card));
+  MOCK_METHOD1(GetCreditCardByGUID, CreditCard*(const std::string& guid));
 };
 
 // The autofill client.
@@ -152,14 +153,17 @@ TEST_F(FullCardRequestTest, GetFullCardPanAndCvcForMaskedServerCard) {
 
 // Verify getting the CVC for a local card.
 TEST_F(FullCardRequestTest, GetFullCardPanAndCvcForLocalCard) {
+  CreditCard card;
+  test::SetCreditCardInfo(&card, nullptr, "4111", "12", "2050");
+
   EXPECT_CALL(*delegate(), OnFullCardRequestSucceeded(
                                CardMatches(CreditCard::LOCAL_CARD, "4111"),
                                base::ASCIIToUTF16("123")));
   EXPECT_CALL(*client(), ShowUnmaskPrompt(_, _, _));
   EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS));
+  EXPECT_CALL(*personal_data(), GetCreditCardByGUID(_))
+      .WillOnce(testing::Return(&card));
 
-  CreditCard card;
-  test::SetCreditCardInfo(&card, nullptr, "4111", "12", "2050");
   request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
                          delegate()->AsWeakPtr());
   CardUnmaskDelegate::UnmaskResponse response;
@@ -419,6 +423,12 @@ TEST_F(FullCardRequestTest, UpdateExpDateForFullServerCard) {
 
 // Verify updating expiration date for a local card.
 TEST_F(FullCardRequestTest, UpdateExpDateForLocalCard) {
+  base::Time::Exploded today;
+  base::Time::Now().LocalExplode(&today);
+  CreditCard card;
+  test::SetCreditCardInfo(&card, nullptr, "4111", "10",
+                          base::StringPrintf("%d", today.year - 1).c_str());
+
   EXPECT_CALL(*delegate(),
               OnFullCardRequestSucceeded(
                   CardMatches(CreditCard::LOCAL_CARD, "4111", "12", "2051"),
@@ -428,12 +438,9 @@ TEST_F(FullCardRequestTest, UpdateExpDateForLocalCard) {
               UpdateCreditCard(
                   CardMatches(CreditCard::LOCAL_CARD, "4111", "12", "2051")));
   EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS));
+  EXPECT_CALL(*personal_data(), GetCreditCardByGUID(_))
+      .WillOnce(testing::Return(&card));
 
-  base::Time::Exploded today;
-  base::Time::Now().LocalExplode(&today);
-  CreditCard card;
-  test::SetCreditCardInfo(&card, nullptr, "4111", "10",
-                          base::StringPrintf("%d", today.year - 1).c_str());
   request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
                          delegate()->AsWeakPtr());
   CardUnmaskDelegate::UnmaskResponse response;
@@ -524,16 +531,19 @@ TEST_F(FullCardRequestTest, IsGettingFullCardForMaskedServerCard) {
 // Verify that FullCardRequest::IsGettingFullCard() is true until the user types
 // in the CVC for a card that is not masked.
 TEST_F(FullCardRequestTest, IsGettingFullCardForLocalCard) {
+  CreditCard card;
+  test::SetCreditCardInfo(&card, nullptr, "4111", "12", "2050");
+
   EXPECT_CALL(*delegate(), OnFullCardRequestSucceeded(
                                CardMatches(CreditCard::LOCAL_CARD, "4111"),
                                base::ASCIIToUTF16("123")));
   EXPECT_CALL(*client(), ShowUnmaskPrompt(_, _, _));
   EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS));
+  EXPECT_CALL(*personal_data(), GetCreditCardByGUID(_))
+      .WillOnce(testing::Return(&card));
 
   EXPECT_FALSE(request()->IsGettingFullCard());
 
-  CreditCard card;
-  test::SetCreditCardInfo(&card, nullptr, "4111", "12", "2050");
   request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
                          delegate()->AsWeakPtr());