Autofill - show expiration date in CVC prompt when card is expired.

chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc

 // Copyright 2014 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 "chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_view.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 30 matching lines @@
   if (card_unmask_view_)
     card_unmask_view_->GotVerificationResult(success);
 }
 
 void CardUnmaskPromptControllerImpl::OnUnmaskDialogClosed() {
   card_unmask_view_ = nullptr;
   delegate_->OnUnmaskPromptClosed();
 }
 
 void CardUnmaskPromptControllerImpl::OnUnmaskResponse(
-    const base::string16& cvc) {
+    const base::string16& cvc,
+    const base::string16& exp_month,
+    const base::string16& exp_year) {
   card_unmask_view_->DisableAndWaitForVerification();
-  delegate_->OnUnmaskResponse(cvc);
+  delegate_->OnUnmaskResponse(cvc, exp_month, exp_year);
 }
 
 content::WebContents* CardUnmaskPromptControllerImpl::GetWebContents() {
   return web_contents_;
 }
 
 base::string16 CardUnmaskPromptControllerImpl::GetWindowTitle() const {
   // TODO(estade): i18n.
-  if (card_.GetServerStatus() == CreditCard::EXPIRED) {
+  if (ShouldRequestExpirationDate()) {
     return base::ASCIIToUTF16("Update and verify your card ") +
         card_.TypeAndLastFourDigits();
   }
 
   return base::ASCIIToUTF16("Verify your card ") +
       card_.TypeAndLastFourDigits();
 }
 
 base::string16 CardUnmaskPromptControllerImpl::GetInstructionsMessage() const {
-  if (card_.GetServerStatus() == CreditCard::EXPIRED) {
+  if (ShouldRequestExpirationDate()) {
     return l10n_util::GetStringUTF16(
         card_.type() == kAmericanExpressCard
             ? IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_EXPIRED_AMEX
             : IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_EXPIRED);
   }
 
   return l10n_util::GetStringUTF16(
       card_.type() == kAmericanExpressCard
           ? IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_AMEX
           : IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS);
@@ skipping 12 matching lines @@
     const base::string16& input_text) const {
   base::string16 trimmed_text;
   base::TrimWhitespace(input_text, base::TRIM_ALL, &trimmed_text);
   size_t input_size = card_.type() == kAmericanExpressCard ? 4 : 3;
   return trimmed_text.size() == input_size &&
          base::ContainsOnlyChars(trimmed_text,
                                  base::ASCIIToUTF16("0123456789"));
 }
 
 }  // namespace autofill