[WebLayer] Simplify the way test bridge accesses PaymentUiService

Context:
Before this CL, PaymentRequestTestBridge accessed PaymentUiService
by CPRService static methods, a CPRService instance and then
PaymentUiService. The excessive use of plumbings in this route can be
simplified.

Changes:
* PaymentRequestTestBridge no longer need to take CPRService to access
  PaymetUiService each time. Instead, CPRService is changed to connect
  PaymentUiService and PaymentRequestTestBridge for only once at the
  beginning, which allows PaymentRequestTestBridge to retain a
  PaymetUiService instance and access it directly since that time.
* The test depends less on the CPRService static instance. This would
  make it easier to let PRService take the static instance instead.

Bug: 1147269

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

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

@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.payments;
 import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import androidx.collection.ArrayMap;
 
 import org.chromium.base.metrics.RecordHistogram;
@@ -154,6 +153,10 @@ public class ChromePaymentRequestService implements BrowserPaymentRequest,
                 /*params=*/mPaymentRequestService, mWebContents,
                 paymentRequestService.isOffTheRecord(), mJourneyLogger, topLevelOrigin,
                 /*observer=*/this);
+        if (PaymentRequestService.getNativeObserverForTest() != null) {
+            PaymentRequestService.getNativeObserverForTest().onPaymentUiServiceCreated(
+                    mPaymentUiService);
+        }
     }
 
     // Implements BrowserPaymentRequest:
@@ -497,89 +500,6 @@ public class ChromePaymentRequestService implements BrowserPaymentRequest,
         methodDataMap.putAll(result);
     }
 
-    /**
-     * Get the WebContents of the Expandable Payment Handler for testing purpose; return null if
-     * nonexistent.
-     *
-     * @return The WebContents of the Expandable Payment Handler.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public static WebContents getPaymentHandlerWebContentsForTest() {
-        if (sShowingPaymentRequest == null) return null;
-        return sShowingPaymentRequest.getPaymentHandlerWebContentsForTestInternal();
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    private WebContents getPaymentHandlerWebContentsForTestInternal() {
-        return mPaymentUiService.getPaymentHandlerWebContentsForTest();
-    }
-
-    /**
-     * Clicks the security icon of the Expandable Payment Handler for testing purpose; return false
-     * if failed.
-     *
-     * @return Whether the click is successful.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public static boolean clickPaymentHandlerSecurityIconForTest() {
-        if (sShowingPaymentRequest == null) return false;
-        return sShowingPaymentRequest.clickPaymentHandlerSecurityIconForTestInternal();
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    private boolean clickPaymentHandlerSecurityIconForTestInternal() {
-        return mPaymentUiService.clickPaymentHandlerSecurityIconForTest();
-    }
-
-    /**
-     * Simulates a click on the close button of the Payment Handler for testing purpose; return
-     * false if failed.
-     *
-     * @return Whether the click is successful.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public static boolean clickPaymentHandlerCloseButtonForTest() {
-        if (sShowingPaymentRequest == null) return false;
-        return sShowingPaymentRequest.clickPaymentHandlerCloseButtonForTestInternal();
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    private boolean clickPaymentHandlerCloseButtonForTestInternal() {
-        return mPaymentUiService.clickPaymentHandlerCloseButtonForTest();
-    }
-
-    /**
-     * Confirms payment in minimal UI. Used only in test.
-     *
-     * @return Whether the payment was confirmed successfully.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public static boolean confirmMinimalUIForTest() {
-        return sShowingPaymentRequest != null
-                && sShowingPaymentRequest.confirmMinimalUIForTestInternal();
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    private boolean confirmMinimalUIForTestInternal() {
-        return mPaymentUiService.confirmMinimalUIForTest();
-    }
-
-    /**
-     * Dismisses the minimal UI. Used only in test.
-     *
-     * @return Whether the dismissal was successful.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public static boolean dismissMinimalUIForTest() {
-        return sShowingPaymentRequest != null
-                && sShowingPaymentRequest.dismissMinimalUIForTestInternal();
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    private boolean dismissMinimalUIForTestInternal() {
-        return mPaymentUiService.dismissMinimalUIForTest();
-    }
-
     /**
      * Called to open a new PaymentHandler UI on the showing PaymentRequest.
      * @param url The url of the payment app to be displayed in the UI.

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

@@ -64,6 +64,7 @@ import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.components.payments.PaymentOptionsUtils;
 import org.chromium.components.payments.PaymentRequestParams;
 import org.chromium.components.payments.PaymentUIsObserver;
+import org.chromium.components.payments.PaymentUiServiceTestInterface;
 import org.chromium.components.payments.Section;
 import org.chromium.components.security_state.SecurityStateModel;
 import org.chromium.content_public.browser.WebContents;
@@ -99,6 +100,7 @@ import java.util.Set;
  */
 public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Observer,
                                          PaymentHandlerUiObserver, FocusChangedObserver,
+                                         PaymentUiServiceTestInterface,
                                          NormalizedAddressRequestDelegate, PaymentRequestUI.Client {
     /** Limit in the number of suggested items in a section. */
     /* package */ static final int SUGGESTIONS_LIMIT = 4;
@@ -393,11 +395,8 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
         return mPaymentRequestUI != null || mMinimalUi != null;
     }
 
-    /**
-     * Confirms payment in minimal UI. Used only in test.
-     *
-     * @return Whether the payment was confirmed successfully.
-     */
+    // Implements PaymentUiServiceTestInterface:
+    @Override
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     public boolean confirmMinimalUIForTest() {
         if (mMinimalUi == null) return false;
@@ -405,11 +404,8 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
         return true;
     }
 
-    /**
-     * Dismisses the minimal UI. Used only in test.
-     *
-     * @return Whether the dismissal was successful.
-     */
+    // Implements PaymentUiServiceTestInterface:
+    @Override
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     public boolean dismissMinimalUIForTest() {
         if (mMinimalUi == null) return false;
@@ -945,12 +941,16 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
         return paymentHandlerWebContents;
     }
 
+    // Implements PaymentUiServiceTestInterface:
+    @Override
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     public WebContents getPaymentHandlerWebContentsForTest() {
         if (mPaymentHandlerUi == null) return null;
         return mPaymentHandlerUi.getWebContentsForTest();
     }
 
+    // Implements PaymentUiServiceTestInterface:
+    @Override
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     public boolean clickPaymentHandlerSecurityIconForTest() {
         if (mPaymentHandlerUi == null) return false;
@@ -958,6 +958,8 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
         return true;
     }
 
+    // Implements PaymentUiServiceTestInterface:
+    @Override
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     public boolean clickPaymentHandlerCloseButtonForTest() {
         if (mPaymentHandlerUi == null) return false;

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

@@ -16,6 +16,7 @@ import org.chromium.chrome.browser.payments.ChromePaymentRequestService;
 import org.chromium.components.autofill.EditableOption;
 import org.chromium.components.payments.PaymentRequestService;
 import org.chromium.components.payments.PaymentRequestService.NativeObserverForTest;
+import org.chromium.components.payments.PaymentUiServiceTestInterface;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentItem;
 
@@ -26,6 +27,8 @@ import java.util.List;
  */
 @JNINamespace("payments")
 public class PaymentRequestTestBridge {
+    private static PaymentUiServiceTestInterface sUiService;
+
     /**
      * A test override of the ChromePaymentRequestService's Delegate. Allows tests to control the
      * answers about the state of the system, in order to control which paths should be tested in
@@ -127,6 +130,17 @@ public class PaymentRequestTestBridge {
             mOnMinimalUIReadyPtr = onMinimalUIReadyPtr;
         }
 
+        @Override
+        public void onPaymentUiServiceCreated(PaymentUiServiceTestInterface uiService) {
+            assert uiService != null;
+            PaymentRequestTestBridge.sUiService = uiService;
+        }
+
+        @Override
+        public void onClosed() {
+            PaymentRequestTestBridge.sUiService = null;
+        }
+
         @Override
         public void onCanMakePaymentCalled() {
             nativeResolvePaymentRequestObserverCallback(mOnCanMakePaymentCalledPtr);
@@ -229,27 +243,27 @@ public class PaymentRequestTestBridge {
 
     @CalledByNative
     private static WebContents getPaymentHandlerWebContentsForTest() {
-        return ChromePaymentRequestService.getPaymentHandlerWebContentsForTest();
+        return sUiService.getPaymentHandlerWebContentsForTest();
     }
 
     @CalledByNative
     private static boolean clickPaymentHandlerSecurityIconForTest() {
-        return ChromePaymentRequestService.clickPaymentHandlerSecurityIconForTest();
+        return sUiService.clickPaymentHandlerSecurityIconForTest();
     }
 
     @CalledByNative
     private static boolean clickPaymentHandlerCloseButtonForTest() {
-        return ChromePaymentRequestService.clickPaymentHandlerCloseButtonForTest();
+        return sUiService.clickPaymentHandlerCloseButtonForTest();
     }
 
     @CalledByNative
     private static boolean confirmMinimalUIForTest() {
-        return ChromePaymentRequestService.confirmMinimalUIForTest();
+        return sUiService.confirmMinimalUIForTest();
     }
 
     @CalledByNative
     private static boolean dismissMinimalUIForTest() {
-        return ChromePaymentRequestService.dismissMinimalUIForTest();
+        return sUiService.dismissMinimalUIForTest();
     }
 
     @CalledByNative

components/payments/content/android/BUILD.gn

@@ -135,6 +135,7 @@ android_library("all_java") {
     "java/src/org/chromium/components/payments/PaymentRequestSpec.java",
     "java/src/org/chromium/components/payments/PaymentResponseHelperInterface.java",
     "java/src/org/chromium/components/payments/PaymentUIsObserver.java",
+    "java/src/org/chromium/components/payments/PaymentUiServiceTestInterface.java",
     "java/src/org/chromium/components/payments/PaymentValidator.java",
     "java/src/org/chromium/components/payments/SkipToGPayHelper.java",
     "java/src/org/chromium/components/payments/SupportedDelegations.java",

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

@@ -154,6 +154,8 @@ public class PaymentRequestService
         void onAbortCalled();
         void onCompleteCalled();
         void onMinimalUIReady();
+        void onPaymentUiServiceCreated(PaymentUiServiceTestInterface uiService);
+        void onClosed();
     }
 
     /**
@@ -989,6 +991,10 @@ public class PaymentRequestService
         }
 
         mOnClosedListener.run();
+
+        if (sNativeObserverForTest != null) {
+            sNativeObserverForTest.onClosed();
+        }
     }
 
     /** @return An observer for the payment request service, if any; otherwise, null. */

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

+// Copyright 2020 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.components.payments;
+
+import org.chromium.content_public.browser.WebContents;
+
+/** The interface of PaymentUiService that provides testing methods. */
+public interface PaymentUiServiceTestInterface {
+    /**
+     * Get the WebContents of the Payment Handler; return null if nonexistent.
+     *
+     * @return The WebContents of the Payment Handler.
+     */
+    WebContents getPaymentHandlerWebContentsForTest();
+
+    /**
+     * Clicks the security icon of the Payment Handler; return false if failed.
+     *
+     * @return Whether the click is successful.
+     */
+    boolean clickPaymentHandlerSecurityIconForTest();
+
+    /**
+     * Simulates a click on the close button of the Payment Handler; return
+     * false if failed.
+     *
+     * @return Whether the click is successful.
+     */
+    boolean clickPaymentHandlerCloseButtonForTest();
+
+    /**
+     * Confirms payment in minimal UI.
+     *
+     * @return Whether the payment was confirmed successfully.
+     */
+    boolean confirmMinimalUIForTest();
+
+    /**
+     * Dismisses the minimal UI.
+     *
+     * @return Whether the dismissal was successful.
+     */
+    boolean dismissMinimalUIForTest();
+}