[WebLayer] Simplify PRService's init logic

Context:
This CL is to simplify the PRService's init logic and the dependency
relationship.

Before the CL,
* PRService creates MojoPRGateKeeper (in a static method) and
  MojoPRGateKeeper creates PRService (constructor). It formed a
  circular dependency loop.
* PRService's init procedure is over complicated as it includes
  multiple similar methods which confused code readers as to where to
  put certain validation codes. The init procedure includes:
 - createPaymentRequest
 - createIfParamsValid
 - PaymentRequestService's constructor
 - initAndValidate

After the CL,
* CPRFactory & WLPRFactory creates MojoPRGateKeeper, and
  MojoPRGateKeeper creates PRService. PaymentRequestService delegates
  CPRFactory/WLPRFactory to create CPRServic/WLPRService. The
  dependency relationship becomes more clear.
* PRService's init procedure get simplified, as it includes:
 - PaymentRequestService's constructor
 - init
 - initAndValidate (will be combined into init in follow-up CL)

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

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

@@ -10,7 +10,9 @@ import androidx.annotation.VisibleForTesting;
 import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.components.payments.BrowserPaymentRequest;
 import org.chromium.components.payments.InvalidPaymentRequest;
+import org.chromium.components.payments.MojoPaymentRequestGateKeeper;
 import org.chromium.components.payments.OriginSecurityChecker;
 import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.components.payments.PaymentRequestService;
@@ -64,6 +66,12 @@ public class ChromePaymentRequestFactory implements InterfaceFactory<PaymentRequ
             mRenderFrameHost = renderFrameHost;
         }
 
+        @Override
+        public BrowserPaymentRequest createBrowserPaymentRequest(
+                PaymentRequestService paymentRequestService) {
+            return new ChromePaymentRequestService(paymentRequestService, this);
+        }
+
         @Override
         public boolean isOffTheRecord() {
             WebContents liveWebContents =
@@ -162,8 +170,8 @@ public class ChromePaymentRequestFactory implements InterfaceFactory<PaymentRequ
         WebContents webContents = WebContentsStatics.fromRenderFrameHost(mRenderFrameHost);
         if (webContents == null || webContents.isDestroyed()) return new InvalidPaymentRequest();
 
-        return PaymentRequestService.createPaymentRequest(mRenderFrameHost, delegate,
-                (paymentRequestService)
-                        -> new ChromePaymentRequestService(paymentRequestService, delegate));
+        return new MojoPaymentRequestGateKeeper(
+                (client, onClosed)
+                        -> new PaymentRequestService(mRenderFrameHost, client, onClosed, delegate));
     }
 }

chrome/test/android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java

@@ -14,6 +14,7 @@ import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.payments.ChromePaymentRequestFactory;
 import org.chromium.chrome.browser.payments.ChromePaymentRequestService;
 import org.chromium.components.autofill.EditableOption;
+import org.chromium.components.payments.BrowserPaymentRequest;
 import org.chromium.components.payments.PaymentApp;
 import org.chromium.components.payments.PaymentRequestService;
 import org.chromium.components.payments.PaymentRequestService.NativeObserverForTest;
@@ -49,6 +50,12 @@ public class PaymentRequestTestBridge {
         public boolean skipUiForBasicCard() {
             return mSkipUiForBasicCard;
         }
+
+        @Override
+        public BrowserPaymentRequest createBrowserPaymentRequest(
+                PaymentRequestService paymentRequestService) {
+            return new ChromePaymentRequestService(paymentRequestService, this);
+        }
     }
 
     /**
@@ -56,7 +63,8 @@ public class PaymentRequestTestBridge {
      * answers about the state of the system, in order to control which paths should be tested in
      * the ChromePaymentRequestService.
      */
-    private static class PaymentRequestDelegateForTest implements PaymentRequestService.Delegate {
+    private abstract static class PaymentRequestDelegateForTest
+            implements PaymentRequestService.Delegate {
         private final boolean mIsOffTheRecord;
         private final boolean mIsValidSsl;
         private final boolean mPrefsCanMakePayment;

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

@@ -25,18 +25,6 @@ import java.util.Map;
  * Android Chrome browser or the WebLayer "browser".
  */
 public interface BrowserPaymentRequest {
-    /** The factory that creates an instance of {@link BrowserPaymentRequest}. */
-    interface Factory {
-        /**
-         * Create an instance of {@link BrowserPaymentRequest}.
-         * @param paymentRequestService The PaymentRequestService to work together with
-         *         the BrowserPaymentRequest instance, cannot be null.
-         * @return An instance of BrowserPaymentRequest, cannot be null.
-         */
-        BrowserPaymentRequest createBrowserPaymentRequest(
-                PaymentRequestService paymentRequestService);
-    }
-
     /**
      * The client of the interface calls this when it has received the payment details update
      * from the merchant and has updated the PaymentRequestSpec.

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

@@ -16,39 +16,29 @@ import org.chromium.payments.mojom.PaymentValidationErrors;
  * Guards against invalid mojo parameters and enforces correct call sequence from mojo IPC in the
  * untrusted renderer, so PaymentRequestService does not have to.
  */
-/* package */ class MojoPaymentRequestGateKeeper implements PaymentRequest {
-    private final PaymentRequestServiceCreator mPaymentRequestServiceCreator;
+public class MojoPaymentRequestGateKeeper implements PaymentRequest {
+    private final Delegate mDelegate;
     private PaymentRequestService mPaymentRequestService;
 
-    /** The creator of PaymentRequestService. */
-    /* package */ interface PaymentRequestServiceCreator {
+    /** The delegate of the class. */
+    public interface Delegate {
         /**
-         * Create an instance of PaymentRequestService if the parameters are valid.
+         * Create an instance of PaymentRequestService.
          * @param client The client of the renderer PaymentRequest, need validation before usage.
-         * @param methodData The supported methods specified by the merchant, need validation before
-         *         usage.
-         * @param details The payment details specified by the merchant, need validation before
-         *         usage.
-         * @param options The payment options specified by the merchant, need validation before
-         *         usage.
-         * @param googlePayBridgeEligible True when the renderer process deems the current request
-         *         eligible for the skip-to-GPay experimental flow. It is ultimately up to the
-         * browser process to determine whether to trigger it.
          * @param onClosedListener The listener that's invoked when PaymentRequestService has
          *         just closed.
          * @return The created instance, if the parameters are valid; otherwise, null.
          */
-        PaymentRequestService createPaymentRequestServiceIfParamsValid(PaymentRequestClient client,
-                PaymentMethodData[] methodData, PaymentDetails details, PaymentOptions options,
-                boolean googlePayBridgeEligible, Runnable onClosedListener);
+        PaymentRequestService createPaymentRequestService(
+                PaymentRequestClient client, Runnable onClosedListener);
     }
 
     /**
      * Create an instance of MojoPaymentRequestGateKeeper.
-     * @param creator The creator of PaymentRequestService.
+     * @param delegate The delegate of the instance.
      */
-    /* package */ MojoPaymentRequestGateKeeper(PaymentRequestServiceCreator creator) {
-        mPaymentRequestServiceCreator = creator;
+    public MojoPaymentRequestGateKeeper(Delegate delegate) {
+        mDelegate = delegate;
     }
 
     // Implement PaymentRequest:
@@ -62,11 +52,10 @@ import org.chromium.payments.mojom.PaymentValidationErrors;
             return;
         }
 
-        // Note that a null value would be assigned when the params are invalid.
-        mPaymentRequestService =
-                mPaymentRequestServiceCreator.createPaymentRequestServiceIfParamsValid(client,
-                        methodData, details, options, googlePayBridgeEligible,
-                        this::onPaymentRequestServiceClosed);
+        PaymentRequestService service =
+                mDelegate.createPaymentRequestService(client, this::onPaymentRequestServiceClosed);
+        if (!service.init(methodData, details, options, googlePayBridgeEligible)) return;
+        mPaymentRequestService = service;
     }
 
     private void onPaymentRequestServiceClosed() {

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

@@ -15,7 +15,6 @@ import org.chromium.base.LocaleUtils;
 import org.chromium.base.Log;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.page_info.CertificateChainHelper;
-import org.chromium.components.payments.BrowserPaymentRequest.Factory;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
@@ -77,23 +76,23 @@ public class PaymentRequestService
     private static NativeObserverForTest sNativeObserverForTest;
     private static boolean sIsLocalHasEnrolledInstrumentQueryQuotaEnforcedForTest;
     private final Runnable mOnClosedListener;
-    private final WebContents mWebContents;
-    private final JourneyLogger mJourneyLogger;
+    private WebContents mWebContents;
+    private JourneyLogger mJourneyLogger;
     private final RenderFrameHost mRenderFrameHost;
-    private final String mTopLevelOrigin;
-    private final String mPaymentRequestOrigin;
-    private final Origin mPaymentRequestSecurityOrigin;
-    private final String mMerchantName;
+    private String mTopLevelOrigin;
+    private String mPaymentRequestOrigin;
+    private Origin mPaymentRequestSecurityOrigin;
+    private String mMerchantName;
     @Nullable
-    private final byte[][] mCertificateChain;
-    private final boolean mIsOffTheRecord;
-    private final PaymentOptions mPaymentOptions;
-    private final boolean mRequestShipping;
-    private final boolean mRequestPayerName;
-    private final boolean mRequestPayerPhone;
-    private final boolean mRequestPayerEmail;
+    private byte[][] mCertificateChain;
+    private boolean mIsOffTheRecord;
+    private PaymentOptions mPaymentOptions;
+    private boolean mRequestShipping;
+    private boolean mRequestPayerName;
+    private boolean mRequestPayerPhone;
+    private boolean mRequestPayerEmail;
     private final Delegate mDelegate;
-    private final int mShippingType;
+    private int mShippingType;
     private final List<PaymentApp> mPendingApps = new ArrayList<>();
     private PaymentRequestSpec mSpec;
     private boolean mHasClosed;
@@ -177,6 +176,14 @@ public class PaymentRequestService
      * override behaviour in both in a similar fashion.
      */
     public interface Delegate {
+        /**
+         * Creates an instance of BrowserPaymentRequest.
+         * @param paymentRequestService The PaymentRequestService that it depends on.
+         * @return The instance.
+         */
+        BrowserPaymentRequest createBrowserPaymentRequest(
+                PaymentRequestService paymentRequestService);
+
         /**
          * @return Whether the merchant's WebContents is currently showing an off-the-record tab.
          *         Return true if the tab profile is not accessible from the WebContents.
@@ -371,97 +378,113 @@ public class PaymentRequestService
     }
 
     /**
-     * Create an instance of {@link PaymentRequest} that provides the Android PaymentRequest
-     * service.
+     * Creates an instance of the class.
      * @param renderFrameHost The RenderFrameHost of the merchant page.
+     * @param client The client of the renderer PaymentRequest, can be null.
+     * @param onClosedListener A listener to be invoked when the service is closed.
      * @param delegate The delegate of this class.
-     * @param browserPaymentRequestFactory The factory that generates BrowserPaymentRequest.
-     * @return The created instance.
      */
-    public static PaymentRequest createPaymentRequest(RenderFrameHost renderFrameHost,
-            Delegate delegate, Factory browserPaymentRequestFactory) {
-        return new MojoPaymentRequestGateKeeper(
-                (client, methodData, details, options, googlePayBridgeEligible, onClosedListener)
-                        -> createIfParamsValid(renderFrameHost, browserPaymentRequestFactory,
-                                client, methodData, details, options, googlePayBridgeEligible,
-                                onClosedListener, delegate));
+    public PaymentRequestService(RenderFrameHost renderFrameHost,
+            @Nullable PaymentRequestClient client, Runnable onClosedListener, Delegate delegate) {
+        assert renderFrameHost != null;
+        assert onClosedListener != null;
+        assert delegate != null;
+
+        mRenderFrameHost = renderFrameHost;
+        mClient = client;
+        mOnClosedListener = onClosedListener;
+        mDelegate = delegate;
+        mHasClosed = false;
     }
 
     /**
-     * @return An instance of {@link PaymentRequestService} only if the parameters are deemed
-     *         valid; Otherwise, null.
+     * Initializes the payment request service.
+     * @param methodData The supported methods specified by the merchant, need validation before
+     *        usage, can be null.
+     * @param details The payment details specified by the merchant, need validation before
+     *        usage, can be null.
+     * @param options The payment options specified by the merchant, need validation before
+     *        usage, can be null.
+     * @param googlePayBridgeEligible True when the renderer process deems the current request
+     *        eligible for the skip-to-GPay experimental flow. It is ultimately up to the
+     *        browser process to determine whether to trigger it.
+     * @return Whether the initialization is successful.
      */
-    @VisibleForTesting
-    @Nullable
-    public static PaymentRequestService createIfParamsValid(RenderFrameHost renderFrameHost,
-            Factory browserPaymentRequestFactory, @Nullable PaymentRequestClient client,
-            @Nullable PaymentMethodData[] methodData, @Nullable PaymentDetails details,
-            @Nullable PaymentOptions options, boolean googlePayBridgeEligible,
-            Runnable onClosedListener, Delegate delegate) {
-        assert renderFrameHost != null;
-        assert browserPaymentRequestFactory != null;
-        assert onClosedListener != null;
-
-        if (renderFrameHost.getLastCommittedOrigin() == null
-                || renderFrameHost.getLastCommittedURL() == null) {
+    public boolean init(@Nullable PaymentMethodData[] methodData, @Nullable PaymentDetails details,
+            @Nullable PaymentOptions options, boolean googlePayBridgeEligible) {
+        if (mRenderFrameHost.getLastCommittedOrigin() == null
+                || mRenderFrameHost.getLastCommittedURL() == null) {
             abortForInvalidDataFromRenderer(
                     /*client=*/null, /*journeyLogger=*/null, ErrorStrings.NO_FRAME);
-            return null;
+            return false;
         }
+        mPaymentRequestSecurityOrigin = mRenderFrameHost.getLastCommittedOrigin();
+        // TODO(crbug.com/992593): replace UrlFormatter with GURL operations.
+        mPaymentRequestOrigin =
+                mDelegate.formatUrlForSecurityDisplay(mRenderFrameHost.getLastCommittedURL());
 
-        WebContents webContents = delegate.getLiveWebContents(renderFrameHost);
-        if (webContents == null || webContents.isDestroyed()) {
+        mWebContents = mDelegate.getLiveWebContents(mRenderFrameHost);
+        if (mWebContents == null || mWebContents.isDestroyed()) {
             abortForInvalidDataFromRenderer(
                     /*client=*/null, /*journeyLogger=*/null, ErrorStrings.NO_WEB_CONTENTS);
-            return null;
+            return false;
         }
+        // TODO(crbug.com/992593): replace UrlFormatter with GURL operations.
+        mTopLevelOrigin = mDelegate.formatUrlForSecurityDisplay(mWebContents.getLastCommittedUrl());
 
-        boolean isOffTheRecord = delegate.isOffTheRecord();
-        JourneyLogger journeyLogger = delegate.createJourneyLogger(isOffTheRecord, webContents);
+        mMerchantName = mWebContents.getTitle();
+        mCertificateChain = mDelegate.getCertificateChain(mWebContents);
+        mIsOffTheRecord = mDelegate.isOffTheRecord();
+        mJourneyLogger = mDelegate.createJourneyLogger(mIsOffTheRecord, mWebContents);
 
-        if (client == null) {
+        if (mClient == null) {
             abortForInvalidDataFromRenderer(
-                    /*client=*/null, journeyLogger, ErrorStrings.INVALID_STATE);
-            return null;
+                    /*client=*/null, mJourneyLogger, ErrorStrings.INVALID_STATE);
+            return false;
         }
 
-        if (!delegate.isOriginSecure(webContents.getLastCommittedUrl())) {
+        if (!mDelegate.isOriginSecure(mWebContents.getLastCommittedUrl())) {
             abortForInvalidDataFromRenderer(
-                    client, journeyLogger, ErrorStrings.NOT_IN_A_SECURE_ORIGIN);
-            return null;
+                    mClient, mJourneyLogger, ErrorStrings.NOT_IN_A_SECURE_ORIGIN);
+            return false;
         }
 
         if (methodData == null) {
             abortForInvalidDataFromRenderer(
-                    client, journeyLogger, ErrorStrings.INVALID_PAYMENT_METHODS_OR_DATA);
-            return null;
+                    mClient, mJourneyLogger, ErrorStrings.INVALID_PAYMENT_METHODS_OR_DATA);
+            return false;
         }
 
         // details has default value, so could never be null, according to payment_request.idl.
         if (details == null) {
             abortForInvalidDataFromRenderer(
-                    client, journeyLogger, ErrorStrings.INVALID_PAYMENT_DETAILS);
-            return null;
+                    mClient, mJourneyLogger, ErrorStrings.INVALID_PAYMENT_DETAILS);
+            return false;
         }
 
         // options has default value, so could never be null, according to
         // payment_request.idl.
         if (options == null) {
             abortForInvalidDataFromRenderer(
-                    client, journeyLogger, ErrorStrings.INVALID_PAYMENT_OPTIONS);
-            return null;
+                    mClient, mJourneyLogger, ErrorStrings.INVALID_PAYMENT_OPTIONS);
+            return false;
         }
+        mPaymentOptions = options;
+        mRequestShipping = mPaymentOptions.requestShipping;
+        mRequestPayerName = mPaymentOptions.requestPayerName;
+        mRequestPayerPhone = mPaymentOptions.requestPayerPhone;
+        mRequestPayerEmail = mPaymentOptions.requestPayerEmail;
+        mShippingType = mPaymentOptions.shippingType;
 
-        PaymentRequestService instance = new PaymentRequestService(client, renderFrameHost,
-                webContents, journeyLogger, options, isOffTheRecord, onClosedListener, delegate);
-        boolean valid = instance.initAndValidate(
-                browserPaymentRequestFactory, methodData, details, googlePayBridgeEligible);
+        mBrowserPaymentRequest = mDelegate.createBrowserPaymentRequest(this);
+        boolean valid = initAndValidate(
+                mBrowserPaymentRequest, methodData, details, googlePayBridgeEligible);
         if (!valid) {
-            instance.close();
-            return null;
+            close();
+            return false;
         }
-        instance.startPaymentAppService();
-        return instance;
+        startPaymentAppService();
+        return true;
     }
 
     private void startPaymentAppService() {
@@ -520,43 +543,6 @@ public class PaymentRequestService
         if (sNativeObserverForTest != null) sNativeObserverForTest.onConnectionTerminated();
     }
 
-    private PaymentRequestService(PaymentRequestClient client, RenderFrameHost renderFrameHost,
-            WebContents webContents, JourneyLogger journeyLogger, PaymentOptions options,
-            boolean isOffTheRecord, Runnable onClosedListener, Delegate delegate) {
-        assert client != null;
-        assert renderFrameHost != null;
-        assert webContents != null;
-        assert journeyLogger != null;
-        assert options != null;
-        assert onClosedListener != null;
-        assert delegate != null;
-
-        mRenderFrameHost = renderFrameHost;
-        mPaymentRequestSecurityOrigin = mRenderFrameHost.getLastCommittedOrigin();
-        mWebContents = webContents;
-
-        // TODO(crbug.com/992593): replace UrlFormatter with GURL operations.
-        mPaymentRequestOrigin =
-                delegate.formatUrlForSecurityDisplay(mRenderFrameHost.getLastCommittedURL());
-        mTopLevelOrigin = delegate.formatUrlForSecurityDisplay(mWebContents.getLastCommittedUrl());
-
-        mPaymentOptions = options;
-        mRequestShipping = mPaymentOptions.requestShipping;
-        mRequestPayerName = mPaymentOptions.requestPayerName;
-        mRequestPayerPhone = mPaymentOptions.requestPayerPhone;
-        mRequestPayerEmail = mPaymentOptions.requestPayerEmail;
-        mShippingType = mPaymentOptions.shippingType;
-
-        mMerchantName = mWebContents.getTitle();
-        mCertificateChain = delegate.getCertificateChain(mWebContents);
-        mIsOffTheRecord = isOffTheRecord;
-        mClient = client;
-        mJourneyLogger = journeyLogger;
-        mOnClosedListener = onClosedListener;
-        mDelegate = delegate;
-        mHasClosed = false;
-    }
-
     /**
      * Set a native-side observer for PaymentRequest implementations. This observer should be set
      * before PaymentRequest implementations are instantiated.
@@ -573,11 +559,11 @@ public class PaymentRequestService
         return sNativeObserverForTest;
     }
 
-    private boolean initAndValidate(Factory factory, PaymentMethodData[] rawMethodData,
-            PaymentDetails details, boolean googlePayBridgeEligible) {
+    private boolean initAndValidate(BrowserPaymentRequest browserPaymentRequest,
+            PaymentMethodData[] rawMethodData, PaymentDetails details,
+            boolean googlePayBridgeEligible) {
         assert rawMethodData != null;
         assert details != null;
-        mBrowserPaymentRequest = factory.createBrowserPaymentRequest(this);
         mJourneyLogger.recordCheckoutStep(CheckoutFunnelStep.INITIATED);
 
         if (!mDelegate.isOriginAllowedToUseWebPaymentApis(mWebContents.getLastCommittedUrl())) {

components/payments/content/android/junit/src/org/chromium/components/payments/PaymentRequestServiceBuilder.java

@@ -8,7 +8,6 @@ import androidx.annotation.Nullable;
 
 import org.mockito.Mockito;
 
-import org.chromium.components.payments.BrowserPaymentRequest.Factory;
 import org.chromium.components.payments.PaymentRequestService.Delegate;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
@@ -31,7 +30,7 @@ public class PaymentRequestServiceBuilder implements PaymentRequestService.Deleg
     private final RenderFrameHost mRenderFrameHost;
     private final Runnable mOnClosedListener;
     private final PaymentAppService mPaymentAppService;
-    private final Factory mBrowserPaymentRequestFactory;
+    private final BrowserPaymentRequest mBrowserPaymentRequest;
     private WebContents mWebContents;
     private boolean mIsOffTheRecord = true;
     private PaymentRequestClient mClient;
@@ -84,12 +83,18 @@ public class PaymentRequestServiceBuilder implements PaymentRequestService.Deleg
         Mockito.doReturn(total).when(mSpec).getRawTotal();
         Map<String, PaymentMethodData> methodDataMap = new HashMap<>();
         Mockito.doReturn(methodDataMap).when(mSpec).getMethodData();
-        mBrowserPaymentRequestFactory = (paymentRequestService) -> browserPaymentRequest;
+        mBrowserPaymentRequest = browserPaymentRequest;
         mOnClosedListener = onClosedListener;
         mClient = client;
         mPaymentAppService = appService;
     }
 
+    @Override
+    public BrowserPaymentRequest createBrowserPaymentRequest(
+            PaymentRequestService paymentRequestService) {
+        return mBrowserPaymentRequest;
+    }
+
     @Override
     public boolean isOffTheRecord() {
         return mIsOffTheRecord;
@@ -258,8 +263,9 @@ public class PaymentRequestServiceBuilder implements PaymentRequestService.Deleg
     }
 
     /* package */ PaymentRequestService build() {
-        return PaymentRequestService.createIfParamsValid(mRenderFrameHost,
-                mBrowserPaymentRequestFactory, mClient, mMethodData, mDetails, mOptions,
-                mGooglePayBridgeEligible, mOnClosedListener, mDelegate);
+        PaymentRequestService service =
+                new PaymentRequestService(mRenderFrameHost, mClient, mOnClosedListener, mDelegate);
+        boolean success = service.init(mMethodData, mDetails, mOptions, mGooglePayBridgeEligible);
+        return success ? service : null;
     }
 }

weblayer/browser/java/org/chromium/weblayer_private/payments/WebLayerPaymentRequestFactory.java

@@ -7,7 +7,9 @@ package org.chromium.weblayer_private.payments;
 import androidx.annotation.Nullable;
 
 import org.chromium.components.embedder_support.browser_context.BrowserContextHandle;
+import org.chromium.components.payments.BrowserPaymentRequest;
 import org.chromium.components.payments.InvalidPaymentRequest;
+import org.chromium.components.payments.MojoPaymentRequestGateKeeper;
 import org.chromium.components.payments.OriginSecurityChecker;
 import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.components.payments.PaymentRequestService;
@@ -42,6 +44,12 @@ public class WebLayerPaymentRequestFactory implements InterfaceFactory<PaymentRe
             mRenderFrameHost = renderFrameHost;
         }
 
+        @Override
+        public BrowserPaymentRequest createBrowserPaymentRequest(
+                PaymentRequestService paymentRequestService) {
+            return new WebLayerPaymentRequestService(paymentRequestService, this);
+        }
+
         @Override
         public boolean isOffTheRecord() {
             ProfileImpl profile = getProfile();
@@ -112,9 +120,8 @@ public class WebLayerPaymentRequestFactory implements InterfaceFactory<PaymentRe
 
         WebContents webContents = WebContentsStatics.fromRenderFrameHost(mRenderFrameHost);
         if (webContents == null || webContents.isDestroyed()) return new InvalidPaymentRequest();
-
-        return PaymentRequestService.createPaymentRequest(mRenderFrameHost, delegate,
-                (paymentRequestService)
-                        -> new WebLayerPaymentRequestService(paymentRequestService, delegate));
+        return new MojoPaymentRequestGateKeeper(
+                (client, onClosed)
+                        -> new PaymentRequestService(mRenderFrameHost, client, onClosed, delegate));
     }
 }