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

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 824 matching lines @@
         mPaymentAppRunning = true;
         instrument.getDetails(mMerchantName, mOrigin, mRawTotal, mRawLineItems,
                 mMethodData.get(instrument.getMethodName()), this);
         recordSuccessFunnelHistograms("PayClicked");
         return !(instrument instanceof AutofillPaymentInstrument);
     }
 
     @Override
     public void onDismiss() {
         disconnectFromClientWithDebugMessage("Dialog dismissed");
-        closeUI(false);
+        closeUI(true);
         recordAbortReasonHistogram(PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER);
     }
 
     private void disconnectFromClientWithDebugMessage(String debugMessage) {
         disconnectFromClientWithDebugMessage(debugMessage, PaymentErrorReason.USER_CANCEL);
     }
 
     private void disconnectFromClientWithDebugMessage(String debugMessage, int reason) {
         Log.d(TAG, debugMessage);
         if (mClient != null) mClient.onError(reason);
         closeClient();
-        closeUI(false);
+        closeUI(true);
     }
 
     @Override
     public boolean merchantNeedsShippingAddress() {
         return mMerchantNeedsShippingAddress;
     }
 
     /**
      * Called by the merchant website to abort the payment.
      */
     @Override
     public void abort() {
         if (mClient == null) return;
         mClient.onAbort(!mPaymentAppRunning);
         if (mPaymentAppRunning) {
             if (sObserverForTest != null) sObserverForTest.onPaymentRequestServiceUnableToAbort();
         } else {
             closeClient();
-            closeUI(false);
+            closeUI(true);
             recordAbortReasonHistogram(PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_MERCHANT);
         }
     }
 
     /**
      * Called when the merchant website has processed the payment.
      */
     @Override
     public void complete(int result) {
         if (mClient == null) return;
         recordSuccessFunnelHistograms("Completed");
         closeUI(PaymentComplete.FAIL != result);
     }
 
     /**
      * Called when the renderer closes the Mojo connection.
      */
     @Override
     public void close() {
         if (mClient == null) return;
         closeClient();
-        closeUI(false);
+        closeUI(true);
         recordAbortReasonHistogram(PaymentRequestMetrics.ABORT_REASON_MOJO_RENDERER_CLOSING);
     }
 
     /**
      * Called when the Mojo connection encounters an error.
      */
     @Override
     public void onConnectionError(MojoException e) {
         if (mClient == null) return;
         closeClient();
-        closeUI(false);
+        closeUI(true);
         recordAbortReasonHistogram(PaymentRequestMetrics.ABORT_REASON_MOJO_CONNECTION_ERROR);
     }
 
     /**
      * Called after retrieving the list of payment instruments in an app.
      */
     @Override
     public void onInstrumentsReady(PaymentApp app, List<PaymentInstrument> instruments) {
         if (mClient == null) return;
         mPendingApps.remove(app);
@@ skipping 138 matching lines @@
      * Called if unable to retrieve instrument details.
      */
     @Override
     public void onInstrumentDetailsError() {
         mUI.onPayButtonProcessingCancelled();
         mPaymentAppRunning = false;
     }
 
     /**
      * Closes the UI. If the client is still connected, then it's notified of UI hiding.
+     *
+     * @param immediateClose If true, then UI immediately closes. If false, the UI shows the error
+     *                       message "There was an error processing your order." This message
+     *                       implies that the merchant attempted to process the order, failed, and
+     *                       called complete("fail") to notify the user. Therefore, this parameter
+     *                       may be "false" only when called from
+     *                       PaymentRequestImpl.complete(int result) method. All other callers
+     *                       should always pass "true."
      */
     private void closeUI(boolean immediateClose) {
         if (mUI != null) {
             mUI.close(immediateClose, new Runnable() {
                 @Override
                 public void run() {
                     if (mClient != null) mClient.onComplete();
                     closeClient();
                 }
             });
@@ skipping 36 matching lines @@
     private void recordAbortReasonHistogram(int abortReason) {
         assert abortReason < PaymentRequestMetrics.ABORT_REASON_MAX;
         if (mHasRecordedAbortReason) return;
 
         mHasRecordedAbortReason = true;
         RecordHistogram.recordEnumeratedHistogram(
                 "PaymentRequest.CheckoutFunnel.Aborted", abortReason,
                 PaymentRequestMetrics.ABORT_REASON_MAX);
     }
 }