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

chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc

Index: chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc b/chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc
index 7f23b62a58bf2327b35ae62cbd913414cba15dd2..70818ee4f62be700b306080ea8c55da872eeffc2 100644
--- a/chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc
+++ b/chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc
@@ -48,9 +48,11 @@ void CardUnmaskPromptControllerImpl::OnUnmaskDialogClosed() {
 }
 
 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() {
@@ -59,7 +61,7 @@ content::WebContents* CardUnmaskPromptControllerImpl::GetWebContents() {
 
 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();
   }
@@ -69,7 +71,7 @@ base::string16 CardUnmaskPromptControllerImpl::GetWindowTitle() const {
 }
 
 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