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

chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc

Index: chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc
diff --git a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc
index 7a974762bcf26e28e52f1e394384ff76b7f825db..69b0c37fbb192050896b820a09e21de521d59593 100644
--- a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc
+++ b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"
 
+#include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/CardUnmaskBridge_jni.h"
@@ -43,7 +44,8 @@ void CardUnmaskPromptViewAndroid::Show() {
           env, controller_->GetInstructionsMessage());
   java_object_.Reset(Java_CardUnmaskBridge_create(
       env, reinterpret_cast<intptr_t>(this), dialog_title.obj(),
-      instructions.obj(),
+      instructions.obj(), controller_->ShouldRequestExpirationDate(),
+      ResourceMapper::MapFromChromiumId(controller_->GetCvcImageRid()),
       view_android->GetWindowAndroid()->GetJavaObject().obj()));
 
   Java_CardUnmaskBridge_show(env, java_object_.obj());
@@ -58,11 +60,13 @@ bool CardUnmaskPromptViewAndroid::CheckUserInputValidity(JNIEnv* env,
 
 void CardUnmaskPromptViewAndroid::OnUserInput(JNIEnv* env,
                                               jobject obj,
-                                              jstring response) {
+                                              jstring cvc,
+                                              jstring month,
+                                              jstring year) {
   controller_->OnUnmaskResponse(
-      base::android::ConvertJavaStringToUTF16(env, response),
-      base::string16(),
-      base::string16());
+      base::android::ConvertJavaStringToUTF16(env, cvc),
+      base::android::ConvertJavaStringToUTF16(env, month),
+      base::android::ConvertJavaStringToUTF16(env, year));
 }
 
 void CardUnmaskPromptViewAndroid::PromptDismissed(JNIEnv* env, jobject obj) {