[WebLayer] Move disconnectForStrictShow, mRejectShowErrorMessage

Moved disconnectForStrictShow, mRejectShowErrorMessage from CPRService
to PRService, because they are the logic that is shareable with
WebLayer.

Change: 1144527

Change-Id: I1449b7e145918f057e7289984a4eb7364f05e900
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519202
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824631}

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

@@ -24,7 +24,6 @@ import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.payments.AbortReason;
 import org.chromium.components.payments.BrowserPaymentRequest;
 import org.chromium.components.payments.CheckoutFunnelStep;
-import org.chromium.components.payments.ErrorMessageUtil;
 import org.chromium.components.payments.ErrorStrings;
 import org.chromium.components.payments.Event;
 import org.chromium.components.payments.JourneyLogger;
@@ -125,9 +124,6 @@ public class ChromePaymentRequestService
     /** The helper to create and fill the response to send to the merchant. */
     private PaymentResponseHelper mPaymentResponseHelper;
 
-    /** If not empty, use this error message for rejecting PaymentRequest.show(). */
-    private String mRejectShowErrorMessage;
-
     /** A helper to manage the Skip-to-GPay experimental flow. */
     private SkipToGPayHelper mSkipToGPayHelper;
     private boolean mIsGooglePayBridgeActivated;
@@ -1147,38 +1143,6 @@ public class ChromePaymentRequestService
         return mPaymentUiService.canUserAddCreditCard();
     }
 
-    // Implements BrowserPaymentRequest:
-    @Override
-    public String getRejectShowErrorMessage() {
-        return mRejectShowErrorMessage;
-    }
-
-    // Implements BrowserPaymentRequest:
-    @Override
-    public void setRejectShowErrorMessage(String errorMessage) {
-        mRejectShowErrorMessage = errorMessage;
-    }
-
-    // Implements BrowserPaymentRequest:
-    @Override
-    public boolean disconnectForStrictShow(boolean isUserGestureShow) {
-        if (!isUserGestureShow || !mSpec.getMethodData().containsKey(MethodStrings.BASIC_CARD)
-                || mPaymentRequestService.getHasEnrolledInstrument()
-                || mPaymentRequestService.getHasNonAutofillApp()
-                || !PaymentFeatureList.isEnabledOrExperimentalFeaturesEnabled(
-                        PaymentFeatureList.STRICT_HAS_ENROLLED_AUTOFILL_INSTRUMENT)) {
-            return false;
-        }
-
-        mRejectShowErrorMessage = ErrorStrings.STRICT_BASIC_CARD_SHOW_REJECT;
-        disconnectFromClientWithDebugMessage(
-                ErrorMessageUtil.getNotSupportedErrorMessage(mSpec.getMethodData().keySet()) + " "
-                        + mRejectShowErrorMessage,
-                PaymentErrorReason.NOT_SUPPORTED);
-
-        return true;
-    }
-
     // Implements PaymentApp.InstrumentDetailsCallback:
     /** Called after retrieving payment details. */
     @Override

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

@@ -129,15 +129,6 @@ public interface BrowserPaymentRequest {
         return false;
     }
 
-    /**
-     * If strict show() conditions are not satisfied, disconnect from client and return true.
-     * @param isUserGestureShow Whether the PaymentRequest.show() is triggered by user gesture.
-     * @return Whether client has been disconnected.
-     */
-    default boolean disconnectForStrictShow(boolean isUserGestureShow) {
-        return false;
-    }
-
     /**
      * Shows the payment apps selector.
      * @return Whether the showing is successful.
@@ -158,11 +149,6 @@ public interface BrowserPaymentRequest {
      */
     default void triggerPaymentAppUiSkipIfApplicable() {}
 
-    /** @return The error message of rejecting the show() request. */
-    default String getRejectShowErrorMessage() {
-        return "";
-    }
-
     /**
      * Called when a new payment app is created.
      * @param paymentApp The new payment app.
@@ -183,12 +169,4 @@ public interface BrowserPaymentRequest {
     default boolean isPaymentSheetBasedPaymentAppSupported() {
         return false;
     }
-
-    // TODO(crbug.com/1144527): this method will be removed once PaymentRequestService has taken
-    // over mRejectShowErrorMessage.
-    /**
-     * Set the error message for show rejection.
-     * @param errorMessage The error message for show rejection.
-     */
-    default void setRejectShowErrorMessage(String errorMessage) {}
 }

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

@@ -86,6 +86,9 @@ public class PaymentRequestService implements PaymentAppFactoryDelegate, Payment
     private boolean mIsFinishedQueryingPaymentApps;
     private boolean mIsCurrentPaymentRequestShowing;
 
+    /** If not empty, use this error message for rejecting PaymentRequest.show(). */
+    private String mRejectShowErrorMessage;
+
     /** Whether PaymentRequest.show() was invoked with a user gesture. */
     private boolean mIsUserGestureShow;
 
@@ -581,16 +584,15 @@ public class PaymentRequestService implements PaymentAppFactoryDelegate, Payment
                     sNativeObserverForTest.onNotSupportedError();
                 }
 
-                String rejectShowErrorMessage = mBrowserPaymentRequest.getRejectShowErrorMessage();
-                if (TextUtils.isEmpty(rejectShowErrorMessage) && !isInTwa()
+                if (TextUtils.isEmpty(mRejectShowErrorMessage) && !isInTwa()
                         && mSpec.getMethodData().get(MethodStrings.GOOGLE_PLAY_BILLING) != null) {
-                    rejectShowErrorMessage = ErrorStrings.APP_STORE_METHOD_ONLY_SUPPORTED_IN_TWA;
+                    mRejectShowErrorMessage = ErrorStrings.APP_STORE_METHOD_ONLY_SUPPORTED_IN_TWA;
                 }
                 mBrowserPaymentRequest.disconnectFromClientWithDebugMessage(
                         ErrorMessageUtil.getNotSupportedErrorMessage(mSpec.getMethodData().keySet())
-                                + (TextUtils.isEmpty(rejectShowErrorMessage)
+                                + (TextUtils.isEmpty(mRejectShowErrorMessage)
                                                 ? ""
-                                                : " " + rejectShowErrorMessage),
+                                                : " " + mRejectShowErrorMessage),
                         PaymentErrorReason.NOT_SUPPORTED);
             }
             if (sObserverForTest != null) {
@@ -598,11 +600,32 @@ public class PaymentRequestService implements PaymentAppFactoryDelegate, Payment
             }
             return true;
         }
-        boolean isDisconnected = mBrowserPaymentRequest.disconnectForStrictShow(mIsUserGestureShow);
-        if (isDisconnected && sObserverForTest != null) {
+        return disconnectForStrictShow(mIsUserGestureShow);
+    }
+
+    /**
+     * If strict show() conditions are not satisfied, disconnect from client and return true.
+     * @param isUserGestureShow Whether the PaymentRequest.show() is triggered by user gesture.
+     * @return Whether client has been disconnected.
+     */
+    private boolean disconnectForStrictShow(boolean isUserGestureShow) {
+        if (!isUserGestureShow || !mSpec.getMethodData().containsKey(MethodStrings.BASIC_CARD)
+                || mHasEnrolledInstrument || mHasNonAutofillApp
+                || !PaymentFeatureList.isEnabledOrExperimentalFeaturesEnabled(
+                        PaymentFeatureList.STRICT_HAS_ENROLLED_AUTOFILL_INSTRUMENT)) {
+            return false;
+        }
+
+        if (sObserverForTest != null) {
             sObserverForTest.onPaymentRequestServiceShowFailed();
         }
-        return isDisconnected;
+        mRejectShowErrorMessage = ErrorStrings.STRICT_BASIC_CARD_SHOW_REJECT;
+        mBrowserPaymentRequest.disconnectFromClientWithDebugMessage(
+                ErrorMessageUtil.getNotSupportedErrorMessage(mSpec.getMethodData().keySet()) + " "
+                        + mRejectShowErrorMessage,
+                PaymentErrorReason.NOT_SUPPORTED);
+
+        return true;
     }
 
     private boolean isInTwa() {
@@ -755,9 +778,8 @@ public class PaymentRequestService implements PaymentAppFactoryDelegate, Payment
     // Implements PaymentAppFactoryDelegate:
     @Override
     public void onPaymentAppCreationError(String errorMessage) {
-        if (mBrowserPaymentRequest != null
-                && TextUtils.isEmpty(mBrowserPaymentRequest.getRejectShowErrorMessage())) {
-            mBrowserPaymentRequest.setRejectShowErrorMessage(errorMessage);
+        if (TextUtils.isEmpty(mRejectShowErrorMessage)) {
+            mRejectShowErrorMessage = errorMessage;
         }
     }