[Payment] CPRService reduces ChromeActivity usages

Context:
In some cases, CPRService passes ChromeActivity to PaymentUiService when
PUiService really needs Context and WindowAndroid. So this CL changes
to provides Context and WindowAndroid to these cases. Doing so can
reduce Chrome features' dependencies on ChromeActivity.

Changes:
* CPRService provides Context and WindowAndroid instead of
  ChromeActivity to methods when applicable.

Bug: 1155788, 1140340, 1140344
Change-Id: Ib934dbbdba25bfc278ce13232d59ef3c4acf2131
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577956
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834987}

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

@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser.payments;
 
+import android.content.Context;
 import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
@@ -49,6 +50,7 @@ import org.chromium.payments.mojom.PaymentOptions;
 import org.chromium.payments.mojom.PaymentRequest;
 import org.chromium.payments.mojom.PaymentResponse;
 import org.chromium.payments.mojom.PaymentValidationErrors;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.url.GURL;
 
 import java.util.ArrayList;
@@ -283,9 +285,9 @@ public class ChromePaymentRequestService
             assert mPaymentUiService.isPaymentRequestUiAlive();
 
             if (isMinimalUiApplicable(isUserGestureShow)) {
-                ChromeActivity chromeActivity = ChromeActivity.fromWebContents(mWebContents);
-                if (chromeActivity == null) return ErrorStrings.ACTIVITY_NOT_FOUND;
-                if (mPaymentUiService.triggerMinimalUI(chromeActivity, mSpec.getRawTotal(),
+                WindowAndroid windowAndroid = mDelegate.getWindowAndroid(mRenderFrameHost);
+                if (windowAndroid == null) return ErrorStrings.WINDOW_NOT_FOUND;
+                if (mPaymentUiService.triggerMinimalUI(windowAndroid, mSpec.getRawTotal(),
                             this::onMinimalUIReady, this::onMinimalUiConfirmed,
                             /*dismissObserver=*/
                             ()
@@ -407,8 +409,8 @@ public class ChromePaymentRequestService
     // Implements BrowserPaymentRequest:
     @Override
     public String continueShow(boolean isFinishedQueryingPaymentApps) {
-        ChromeActivity chromeActivity = ChromeActivity.fromWebContents(mWebContents);
-        if (chromeActivity == null) return ErrorStrings.ACTIVITY_NOT_FOUND;
+        Context context = mDelegate.getContext(mRenderFrameHost);
+        if (context == null) return ErrorStrings.CONTEXT_NOT_FOUND;
 
         mPaymentUiService.updateDetailsOnPaymentRequestUI(mSpec.getPaymentDetails());
 
@@ -416,7 +418,7 @@ public class ChromePaymentRequestService
         // promise gets resolved before all apps are ready.
         if (mPaymentUiService.isPaymentRequestUiAlive()
                 && mPaymentUiService.shouldShowShippingSection()) {
-            mPaymentUiService.createShippingSectionForPaymentRequestUI(chromeActivity);
+            mPaymentUiService.createShippingSectionForPaymentRequestUI(context);
         }
 
         // Triggered transaction amount gets recorded when both of the following conditions are met:

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

@@ -37,6 +37,9 @@ import org.chromium.chrome.browser.payments.ShippingStrings;
 import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator;
 import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator.PaymentHandlerUiObserver;
 import org.chromium.chrome.browser.payments.minimal.MinimalUICoordinator;
+import org.chromium.chrome.browser.payments.minimal.MinimalUICoordinator.ConfirmObserver;
+import org.chromium.chrome.browser.payments.minimal.MinimalUICoordinator.DismissObserver;
+import org.chromium.chrome.browser.payments.minimal.MinimalUICoordinator.ReadyObserver;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSection.FocusChangedObserver;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
@@ -79,6 +82,7 @@ import org.chromium.payments.mojom.PaymentMethodData;
 import org.chromium.payments.mojom.PaymentOptions;
 import org.chromium.payments.mojom.PaymentShippingOption;
 import org.chromium.payments.mojom.PaymentValidationErrors;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.url.GURL;
 
 import java.util.ArrayList;
@@ -467,24 +471,25 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
 
     /**
      * Triggers the minimal UI.
-     * @param chromeActivity The Android activity for the Chrome UI that will host the minimal UI.
+     * @param windowAndroid The window of the main activity.
      * @param mRawTotal The raw total of the payment item.
      * @param readyObserver The onMinimalUIReady function.
      * @param confirmObserver The onMinimalUiConfirmed function.
      * @param dismissObserver The onMinimalUiDismissed function.
+     * @return Whether the triggering is successful.
      */
-    public boolean triggerMinimalUI(ChromeActivity chromeActivity, PaymentItem mRawTotal,
-            MinimalUICoordinator.ReadyObserver readyObserver,
-            MinimalUICoordinator.ConfirmObserver confirmObserver,
-            MinimalUICoordinator.DismissObserver dismissObserver) {
+    public boolean triggerMinimalUI(WindowAndroid windowAndroid, PaymentItem mRawTotal,
+            ReadyObserver readyObserver, ConfirmObserver confirmObserver,
+            DismissObserver dismissObserver) {
+        Context context = windowAndroid.getContext().get();
+        if (context == null) return false;
         // Do not show the Payment Request UI dialog even if the minimal UI is suppressed.
         mPaymentUisShowStateReconciler.onBottomSheetShown();
         mMinimalUi = new MinimalUICoordinator();
         PaymentApp selectedApp = getSelectedPaymentApp();
-        return mMinimalUi.show(chromeActivity,
-                BottomSheetControllerProvider.from(chromeActivity.getWindowAndroid()), selectedApp,
-                mCurrencyFormatterMap.get(mRawTotal.amount.currency), mUiShoppingCart.getTotal(),
-                readyObserver, confirmObserver, dismissObserver);
+        return mMinimalUi.show(context, BottomSheetControllerProvider.from(windowAndroid),
+                selectedApp, mCurrencyFormatterMap.get(mRawTotal.amount.currency),
+                mUiShoppingCart.getTotal(), readyObserver, confirmObserver, dismissObserver);
     }
 
     /**
@@ -985,9 +990,6 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
     @Nullable
     public WebContents showPaymentHandlerUI(GURL url, boolean isOffTheRecord) {
         if (mPaymentHandlerUi != null) return null;
-        ChromeActivity chromeActivity = ChromeActivity.fromWebContents(mWebContents);
-        if (chromeActivity == null) return null;
-
         PaymentHandlerCoordinator paymentHandlerUi = new PaymentHandlerCoordinator();
         WebContents paymentHandlerWebContents = paymentHandlerUi.show(
                 /*paymentRequestWebContents=*/mWebContents, url, isOffTheRecord,

components/payments/content/android/java/src/org/chromium/components/payments/PaymentRequestService.java

@@ -4,6 +4,7 @@
 
 package org.chromium.components.payments;
 
+import android.content.Context;
 import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
@@ -36,6 +37,7 @@ import org.chromium.payments.mojom.PaymentResponse;
 import org.chromium.payments.mojom.PaymentShippingOption;
 import org.chromium.payments.mojom.PaymentShippingType;
 import org.chromium.payments.mojom.PaymentValidationErrors;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.url.GURL;
 import org.chromium.url.Origin;
 
@@ -286,6 +288,28 @@ public class PaymentRequestService
         default PaymentAppService getPaymentAppService() {
             return PaymentAppService.getInstance();
         }
+
+        /**
+         * @return The context of the current activity, can be null when WebContents has been
+         *         destroyed, the activity is gone, the window is closed, etc.
+         */
+        @Nullable
+        default Context getContext(RenderFrameHost renderFrameHost) {
+            WindowAndroid window = getWindowAndroid(renderFrameHost);
+            if (window == null) return null;
+            return window.getContext().get();
+        }
+
+        /**
+         * @return The WindowAndroid of the current activity, can be null when WebContents has
+         *          been destroyed, the activity is gone, etc.
+         */
+        @Nullable
+        default WindowAndroid getWindowAndroid(RenderFrameHost renderFrameHost) {
+            WebContents webContents = PaymentRequestServiceUtil.getLiveWebContents(renderFrameHost);
+            if (webContents == null) return null;
+            return webContents.getTopLevelNativeWindow();
+        }
     }
 
     /**

components/payments/content/android/java_templates/ErrorStrings.java.tmpl

@@ -28,6 +28,10 @@ public abstract class ErrorStrings {{
 
     public static final String ACTIVITY_NOT_FOUND = "Unable to find Chrome activity.";
 
+    public static final String CONTEXT_NOT_FOUND = "Unable to find Chrome context.";
+
+    public static final String WINDOW_NOT_FOUND = "Unable to find Chrome window.";
+
     public static final String PAYMENT_APP_INVALID_RESPONSE = "Payment app response is not valid.";
 
     public static final String PAYMENT_APP_LAUNCH_FAIL = "Unable to invoke the payment app.";