[Merge M-53] Enable closing while processing payment.

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
index 38b86b91fe0b433dae4735b8533855c3bd77495e..ad29fb79c1bdef23a659e469ae832826f453a648 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
@@ -530,14 +530,12 @@ public class PaymentRequestUI implements DialogInterface.OnDismissListener, View
             }
         };
 
-        if (shouldCloseImmediately || !mIsProcessingPayClicked) {
+        if (shouldCloseImmediately) {
             // The shouldCloseImmediately boolean is true when the merchant calls
             // instrumentResponse.complete("success") or instrumentResponse.complete("")
             // in JavaScript.
             dismissRunnable.run();
         } else {
-            mIsProcessingPayClicked = false;
-
             // Animate the bottom sheet going away.
             new DisappearingAnimator(false);
 
@@ -756,6 +754,7 @@ public class PaymentRequestUI implements DialogInterface.OnDismissListener, View
      */
     public void showProcessingMessage() {
         assert mIsProcessingPayClicked;
+        mIsProcessingPayClicked = false;
         changeSpinnerVisibility(true);
         mDialog.show();
     }