[PRImpl] Move PaymentHandlerUI

Change:
* Move mPaymentHandlerUI from PRImpl to PaymentUIsManager.

Bug: 1102522

Change-Id: I7f74893ad5e92f2ea6d97636fab9e1cfe38c2e23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317605
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: Sahel Sharify <sahel@chromium.org>
Reviewed-by: Liquan (Max) Gu <maxlg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792767}

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

@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.OverviewModeObserver;
 import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator;
-import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator.PaymentHandlerUiObserver;
 import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator.PaymentHandlerWebContentsObserver;
 import org.chromium.chrome.browser.payments.minimal.MinimalUICoordinator;
 import org.chromium.chrome.browser.payments.ui.ContactDetailsSection;
@@ -134,7 +133,7 @@ public class PaymentRequestImpl
                    PaymentApp.InstrumentDetailsCallback,
                    PaymentResponseHelper.PaymentResponseRequesterDelegate, FocusChangedObserver,
                    NormalizedAddressRequestDelegate, PaymentDetailsConverter.MethodChecker,
-                   PaymentHandlerUiObserver, PaymentUIsManager.Delegate {
+                   PaymentUIsManager.Delegate {
     /**
      * A delegate to ask questions about the system, that allows tests to inject behaviour without
      * having to modify the entire system. This partially mirrors a similar C++
@@ -350,7 +349,6 @@ public class PaymentRequestImpl
     private final PaymentUIsManager mPaymentUIsManager;
     private MinimalUICoordinator mMinimalUi;
     private PaymentApp mInvokedPaymentApp;
-    private PaymentHandlerCoordinator mPaymentHandlerUi;
     private boolean mHideServerAutofillCards;
     private ContactEditor mContactEditor;
     private boolean mHasRecordedAbortReason;
@@ -1153,8 +1151,7 @@ public class PaymentRequestImpl
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     private WebContents getPaymentHandlerWebContentsForTestInternal() {
-        if (mPaymentHandlerUi == null) return null;
-        return mPaymentHandlerUi.getWebContentsForTest();
+        return mPaymentUIsManager.getPaymentHandlerWebContentsForTest();
     }
 
     /**
@@ -1171,9 +1168,7 @@ public class PaymentRequestImpl
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     private boolean clickPaymentHandlerSecurityIconForTestInternal() {
-        if (mPaymentHandlerUi == null) return false;
-        mPaymentHandlerUi.clickSecurityIconForTest();
-        return true;
+        return mPaymentUIsManager.clickPaymentHandlerSecurityIconForTest();
     }
 
     /**
@@ -1238,13 +1233,8 @@ public class PaymentRequestImpl
         assert mInvokedPaymentApp != null;
         assert mInvokedPaymentApp.getPaymentAppType() == PaymentAppType.SERVICE_WORKER_APP;
 
-        if (mPaymentHandlerUi != null) return false;
-        mPaymentHandlerUi = new PaymentHandlerCoordinator();
-        ChromeActivity chromeActivity = ChromeActivity.fromWebContents(mWebContents);
-        if (chromeActivity == null) return false;
-
-        boolean success = mPaymentHandlerUi.show(chromeActivity, url, mIsOffTheRecord,
-                paymentHandlerWebContentsObserver, /*uiObserver=*/this);
+        boolean success = mPaymentUIsManager.showPaymentHandlerUI(
+                mWebContents, url, paymentHandlerWebContentsObserver, mIsOffTheRecord);
         if (success) {
             // UKM for payment app origin should get recorded only when the origin of the invoked
             // payment app is shown to the user.
@@ -1253,18 +1243,6 @@ public class PaymentRequestImpl
         return success;
     }
 
-    @Override
-    public void onPaymentHandlerUiClosed() {
-        mPaymentUIsManager.getPaymentUisShowStateReconciler().onBottomSheetClosed();
-        mPaymentHandlerUi = null;
-    }
-
-    @Override
-    public void onPaymentHandlerUiShown() {
-        assert mPaymentHandlerUi != null;
-        mPaymentUIsManager.getPaymentUisShowStateReconciler().onBottomSheetShown();
-    }
-
     @Override
     public boolean isInvokedInstrumentValidForPaymentMethodIdentifier(String methodName) {
         return mInvokedPaymentApp != null
@@ -2674,19 +2652,13 @@ public class PaymentRequestImpl
         PersonalDataManager.getInstance().normalizeAddress(address.getProfile(), this);
     }
 
-    private void ensureHideAndResetPaymentHandlerUi() {
-        if (mPaymentHandlerUi == null) return;
-        mPaymentHandlerUi.hide();
-        mPaymentHandlerUi = null;
-    }
-
     /**
      * Closes the UI and destroys native objects. If the client is still connected, then it's
      * notified of UI hiding. This PaymentRequestImpl object can't be reused after this function is
      * called.
      */
     private void closeUIAndDestroyNativeObjects() {
-        ensureHideAndResetPaymentHandlerUi();
+        mPaymentUIsManager.ensureHideAndResetPaymentHandlerUi();
         if (mMinimalUi != null) {
             mMinimalUi.hide();
             mMinimalUi = null;

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

@@ -5,8 +5,10 @@
 package org.chromium.chrome.browser.payments.ui;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.Callback;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.payments.AddressEditor;
 import org.chromium.chrome.browser.payments.AutofillAddress;
@@ -15,6 +17,9 @@ import org.chromium.chrome.browser.payments.AutofillPaymentAppFactory;
 import org.chromium.chrome.browser.payments.CardEditor;
 import org.chromium.chrome.browser.payments.PaymentRequestImpl;
 import org.chromium.chrome.browser.payments.SettingsAutofillAndPaymentsObserver;
+import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator;
+import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator.PaymentHandlerUiObserver;
+import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator.PaymentHandlerWebContentsObserver;
 import org.chromium.components.autofill.EditableOption;
 import org.chromium.components.payments.CurrencyFormatter;
 import org.chromium.components.payments.PaymentApp;
@@ -23,11 +28,13 @@ import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.components.payments.PaymentOptionsUtils;
 import org.chromium.components.payments.PaymentRequestLifecycleObserver;
 import org.chromium.components.payments.PaymentRequestParams;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentCurrencyAmount;
 import org.chromium.payments.mojom.PaymentDetails;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;
 import org.chromium.payments.mojom.PaymentShippingOption;
+import org.chromium.url.GURL;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,8 +50,10 @@ import java.util.Set;
  * This class manages all of the UIs related to payment. The UI logic of {@link PaymentRequestImpl}
  * should be moved into this class.
  */
-public class PaymentUIsManager
-        implements SettingsAutofillAndPaymentsObserver.Observer, PaymentRequestLifecycleObserver {
+public class PaymentUIsManager implements SettingsAutofillAndPaymentsObserver.Observer,
+                                          PaymentRequestLifecycleObserver,
+                                          PaymentHandlerUiObserver {
+    private PaymentHandlerCoordinator mPaymentHandlerUi;
     private Callback<PaymentInformation> mPaymentInformationCallback;
     private SectionInformation mUiShippingOptions;
     private final Delegate mDelegate;
@@ -590,4 +599,59 @@ public class PaymentUIsManager
 
         return false;
     }
+
+    // Implement PaymentHandlerUiObserver:
+    @Override
+    public void onPaymentHandlerUiClosed() {
+        mPaymentUisShowStateReconciler.onBottomSheetClosed();
+        mPaymentHandlerUi = null;
+    }
+
+    // Implement PaymentHandlerUiObserver:
+    @Override
+    public void onPaymentHandlerUiShown() {
+        assert mPaymentHandlerUi != null;
+        mPaymentUisShowStateReconciler.onBottomSheetShown();
+    }
+
+    /** Close the PaymentHandler UI if not already. */
+    public void ensureHideAndResetPaymentHandlerUi() {
+        if (mPaymentHandlerUi == null) return;
+        mPaymentHandlerUi.hide();
+        mPaymentHandlerUi = null;
+    }
+
+    /**
+     * Create and show the (BottomSheet) PaymentHandler UI.
+     * @param webContents The WebContents of the merchant page.
+     * @param url The URL of the payment app.
+     * @param paymentHandlerWebContentsObserver An observer of the WebContents of the Payment
+     *         Handler UI.
+     * @param isOffTheRecord Whether the merchant page is currently in an OffTheRecord tab.
+     * @return Whether the PaymentHandler UI is shown successfully.
+     */
+    public boolean showPaymentHandlerUI(WebContents webContents, GURL url,
+            PaymentHandlerWebContentsObserver paymentHandlerWebContentsObserver,
+            boolean isOffTheRecord) {
+        if (mPaymentHandlerUi != null) return false;
+        ChromeActivity chromeActivity = ChromeActivity.fromWebContents(webContents);
+        if (chromeActivity == null) return false;
+
+        mPaymentHandlerUi = new PaymentHandlerCoordinator();
+        return mPaymentHandlerUi.show(chromeActivity, url, isOffTheRecord,
+                paymentHandlerWebContentsObserver, /*uiObserver=*/this);
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    public WebContents getPaymentHandlerWebContentsForTest() {
+        if (mPaymentHandlerUi == null) return null;
+        return mPaymentHandlerUi.getWebContentsForTest();
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    public boolean clickPaymentHandlerSecurityIconForTest() {
+        if (mPaymentHandlerUi == null) return false;
+        mPaymentHandlerUi.clickSecurityIconForTest();
+        return true;
+    }
 }