PaymentRequest: complete() method should take PaymentComplete enum value.

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 12 matching lines @@
 import org.chromium.chrome.browser.payments.ui.ShoppingCart;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.preferences.autofill.AutofillCreditCardEditor;
 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileEditor;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.components.safejson.JsonSanitizer;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.mojo.system.MojoException;
+import org.chromium.mojom.payments.PaymentComplete;
 import org.chromium.mojom.payments.PaymentDetails;
 import org.chromium.mojom.payments.PaymentItem;
 import org.chromium.mojom.payments.PaymentMethodData;
 import org.chromium.mojom.payments.PaymentOptions;
 import org.chromium.mojom.payments.PaymentRequest;
 import org.chromium.mojom.payments.PaymentRequestClient;
 import org.chromium.mojom.payments.PaymentResponse;
 import org.chromium.mojom.payments.ShippingOption;
 import org.chromium.ui.base.WindowAndroid;
 import org.json.JSONException;
@@ skipping 529 matching lines @@
         assert selectedPaymentMethod instanceof PaymentInstrument;
         PaymentInstrument instrument = (PaymentInstrument) selectedPaymentMethod;
         mPaymentAppRunning = true;
         instrument.getDetails(mMerchantName, mOrigin, mRawTotal, mRawLineItems,
                 mMethodData.get(instrument.getMethodName()), this);
     }
 
     @Override
     public void onDismiss() {
         disconnectFromClientWithDebugMessage("Dialog dismissed");
-        closeUI(false);
+        closeUI(true);

[please use gerrit instead, 2016/06/16 00:31:45]

false

     }
 
     @Override
     public boolean merchantNeedsShippingAddress() {
         return mMerchantNeedsShippingAddress;
     }
 
     /**
      * Called by the merchant website to abort the payment.
      */
     @Override
     public void abort() {
         mClient.onAbort(!mPaymentAppRunning);
         if (mPaymentAppRunning) {
             if (sObserverForTest != null) sObserverForTest.onPaymentRequestServiceUnableToAbort();
         } else {
             closeClient();
-            closeUI(false);
+            closeUI(true);

[please use gerrit instead, 2016/06/16 00:31:46]

false

         }
     }
 
     /**
      * Called when the merchant website has processed the payment.
      */
     @Override
-    public void complete(boolean success) {
-        closeUI(success);
+    public void complete(int result) {
+        closeUI(PaymentComplete.FAIL != result);
     }
 
     /**
      * Called when the renderer closes the Mojo connection.
      */
     @Override
     public void close() {
         closeClient();
-        closeUI(false);
+        closeUI(true);

[please use gerrit instead, 2016/06/16 00:31:45]

false

     }
 
     /**
      * Called when the Mojo connection encounters an error.
      */
     @Override
     public void onConnectionError(MojoException e) {
         closeClient();
-        closeUI(false);
+        closeUI(true);

[please use gerrit instead, 2016/06/16 00:31:45]

false

     }
 
     /**
      * Called after retrieving the list of payment instruments in an app.
      */
     @Override
     public void onInstrumentsReady(PaymentApp app, List<PaymentInstrument> instruments) {
         mPendingApps.remove(app);
 
         if (instruments != null) {
@@ skipping 42 matching lines @@
 
         mClient.onPaymentResponse(response);
     }
 
     /**
      * Called if unable to retrieve instrument details.
      */
     @Override
     public void onInstrumentDetailsError() {
         disconnectFromClientWithDebugMessage("Failed to retrieve payment instrument details");
-        closeUI(false);
+        closeUI(true);

[please use gerrit instead, 2016/06/16 00:31:45]

false

     }
 
     private void disconnectFromClientWithDebugMessage(String debugMessage) {
         Log.d(TAG, debugMessage);
         mClient.onError();
         closeClient();
     }
 
     /**
      * Closes the UI. If the client is still connected, then it's notified of UI hiding.
      */
-    private void closeUI(boolean paymentSuccess) {
+    private void closeUI(boolean immediateClose) {
         if (mUI != null) {
-            mUI.close(paymentSuccess, new Runnable() {
+            mUI.close(immediateClose, new Runnable() {
                 @Override
                 public void run() {
                     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;
     }
 
     @VisibleForTesting
     public static void setObserverForTest(PaymentRequestServiceObserverForTest observerForTest) {
         sObserverForTest = observerForTest;
     }
 }