Reland: Test dismissing CVC prompt for PaymentRequest

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
index e076df91fa795604ff8c6a655d3c889b22f54889..b95ffbc73e78ad554263a5618b1f9cd8e47266af 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -472,7 +472,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
      */
     @Override
     public void abort() {
-        mClient = null;
+        closeClient();
         closeUI(false);
     }
 
@@ -489,7 +489,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
      */
     @Override
     public void close() {
-        mClient = null;
+        closeClient();
         closeUI(false);
     }
 
@@ -498,7 +498,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
      */
     @Override
     public void onConnectionError(MojoException e) {
-        mClient = null;
+        closeClient();
         closeUI(false);
     }
 
@@ -570,7 +570,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
     private void disconnectFromClientWithDebugMessage(String debugMessage) {
         Log.d(TAG, debugMessage);
         mClient.onError();
-        mClient = null;
+        closeClient();
     }
 
     /**
@@ -581,9 +581,8 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
             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;
@@ -598,4 +597,9 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
             mPaymentMethods = null;
         }
     }
+
+    private void closeClient() {
+        if (mClient != null) mClient.close();
+        mClient = null;
+    }
 }