Reland: Test dismissing CVC prompt for PaymentRequest

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

 // Copyright 2016 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.payments;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.text.TextUtils;
@@ skipping 479 matching lines @@
     public void onDismiss() {
         disconnectFromClientWithDebugMessage("Dialog dismissed");
         closeUI(false);
     }
 
     /**
      * Called by the merchant website to abort the payment.
      */
     @Override
     public void abort() {
-        mClient = null;
+        closeClient();
         closeUI(false);
     }
 
     /**
      * Called when the merchant website has processed the payment.
      */
     @Override
     public void complete(boolean success) {
         closeUI(success);
     }
 
     /**
      * Called when the renderer closes the Mojo connection.
      */
     @Override
     public void close() {
-        mClient = null;
+        closeClient();
         closeUI(false);
     }
 
     /**
      * Called when the Mojo connection encounters an error.
      */
     @Override
     public void onConnectionError(MojoException e) {
-        mClient = null;
+        closeClient();
         closeUI(false);
     }
 
     /**
      * Called after retrieving the list of payment instruments in an app.
      */
     @Override
     public void onInstrumentsReady(PaymentApp app, List<PaymentInstrument> instruments) {
         mPendingApps.remove(app);
 
@@ skipping 51 matching lines @@
      */
     @Override
     public void onInstrumentDetailsError() {
         disconnectFromClientWithDebugMessage("Failed to retrieve payment instrument details");
         closeUI(false);
     }
 
     private void disconnectFromClientWithDebugMessage(String debugMessage) {
         Log.d(TAG, debugMessage);
         mClient.onError();
-        mClient = null;
+        closeClient();
     }
 
     /**
      * Closes the UI. If the client is still connected, then it's notified of UI hiding.
      */
     private void closeUI(boolean paymentSuccess) {
         if (mUI != null) {
             mUI.close(paymentSuccess, new Runnable() {
                 @Override
                 public void run() {
-                    if (mClient == null) return;
-                    mClient.onComplete();
-                    mClient = null;
+                    if (mClient != null) mClient.onComplete();
+                    closeClient();
                 }
             });
             mUI = null;
         }
 
         if (mPaymentMethodsSection != null) {
             for (int i = 0; i < mPaymentMethodsSection.getSize(); i++) {
                 PaymentOption option = mPaymentMethodsSection.getItem(i);
                 assert option instanceof PaymentInstrument;
                 ((PaymentInstrument) option).dismiss();
             }
             mPaymentMethodsSection = null;
         }
     }
+
+    private void closeClient() {
+        if (mClient != null) mClient.close();
+        mClient = null;
+    }
 }