Update Android Card Unmask prompt to rely on the controller a bit more.

chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java

 // 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.
 
 package org.chromium.chrome.browser.autofill;
 
 import android.app.Activity;
 import android.os.Handler;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.ui.autofill.CardUnmaskPrompt;
 import org.chromium.ui.autofill.CardUnmaskPrompt.CardUnmaskPromptDelegate;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
 * JNI call glue for CardUnmaskPrompt C++ and Java objects.
 */
 @JNINamespace("autofill")
 public class CardUnmaskBridge implements CardUnmaskPromptDelegate {
     private final long mNativeCardUnmaskPromptViewAndroid;
     private final CardUnmaskPrompt mCardUnmaskPrompt;
 
-    public CardUnmaskBridge(long nativeCardUnmaskPromptViewAndroid, WindowAndroid windowAndroid) {
+    public CardUnmaskBridge(long nativeCardUnmaskPromptViewAndroid, String title,
+            String instructions, WindowAndroid windowAndroid) {
         mNativeCardUnmaskPromptViewAndroid = nativeCardUnmaskPromptViewAndroid;
         Activity activity = windowAndroid.getActivity().get();
         if (activity == null) {
             mCardUnmaskPrompt = null;
             // Clean up the native counterpart.  This is posted to allow the native counterpart
             // to fully finish the construction of this glue object before we attempt to delete it.
             new Handler().post(new Runnable() {
                 @Override
                 public void run() {
                     dismissed();
                 }
             });
         } else {
-            mCardUnmaskPrompt = new CardUnmaskPrompt(activity, this);
+            mCardUnmaskPrompt = new CardUnmaskPrompt(activity, this, title, instructions);
         }
     }
 
     @CalledByNative
-    private static CardUnmaskBridge create(long nativeUnmaskPrompt,
-            WindowAndroid windowAndroid) {
-        return new CardUnmaskBridge(nativeUnmaskPrompt, windowAndroid);
+    private static CardUnmaskBridge create(long nativeUnmaskPrompt, String title,
+            String instructions, WindowAndroid windowAndroid) {
+        return new CardUnmaskBridge(nativeUnmaskPrompt, title, instructions, windowAndroid);
     }
 
     @Override
     public void dismissed() {
         nativePromptDismissed(mNativeCardUnmaskPromptViewAndroid);
     }
 
     @Override
+    public boolean checkUserInputValidity(String userResponse) {
+        return nativeCheckUserInputValidity(mNativeCardUnmaskPromptViewAndroid, userResponse);
+    }
+
+    @Override
     public void onUserInput(String userResponse) {
         nativeOnUserInput(mNativeCardUnmaskPromptViewAndroid, userResponse);
     }
 
     /**
      * Shows a prompt for unmasking a Wallet credit card.
      */
     @CalledByNative
     private void show() {
         if (mCardUnmaskPrompt != null) mCardUnmaskPrompt.show();
@@ skipping 12 matching lines @@
      */
     @CalledByNative
     private void disableAndWaitForVerification() {
         if (mCardUnmaskPrompt != null) mCardUnmaskPrompt.disableAndWaitForVerification();
     }
 
     /**
      * Indicate that verification failed, allow user to retry.
      */
     @CalledByNative
-    private void verificationFailed() {
-        if (mCardUnmaskPrompt != null) mCardUnmaskPrompt.verificationFailed();
+    private void verificationFinished(boolean success) {
+        if (mCardUnmaskPrompt != null) mCardUnmaskPrompt.verificationFinished(success);
     }
 
     private native void nativePromptDismissed(long nativeCardUnmaskPromptViewAndroid);
+    private native boolean nativeCheckUserInputValidity(
+            long nativeCardUnmaskPromptViewAndroid, String userResponse);
     private native void nativeOnUserInput(
             long nativeCardUnmaskPromptViewAndroid, String userResponse);
 }