[WebLayer] Remove PaymentRequestService#Delegate#isWebContentsActive

Context:
The isWebContentsActive() method used for testing purpose, but it's
always set to true in tests, so this CL removes the method. Going
forwards, if there's a need to create "inactive" WebContents in tests,
we should fabricate an inactive WebContents instead.

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

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

@@ -17,7 +17,6 @@ import org.chromium.components.payments.PaymentRequestService;
 import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.content_public.browser.FeaturePolicyFeature;
 import org.chromium.content_public.browser.RenderFrameHost;
-import org.chromium.content_public.browser.Visibility;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsStatics;
 import org.chromium.mojo.system.MojoException;
@@ -84,14 +83,6 @@ public class ChromePaymentRequestFactory implements InterfaceFactory<PaymentRequ
             return SslValidityChecker.getInvalidSslCertificateErrorMessage(liveWebContents);
         }
 
-        @Override
-        public boolean isWebContentsActive() {
-            // TODO(crbug.com/1128658): Try making the WebContents inactive for instrumentation
-            // tests rather than mocking it with this method.
-            WebContents liveWebContents = getLiveWebContents();
-            return liveWebContents != null && liveWebContents.getVisibility() == Visibility.VISIBLE;
-        }
-
         @Override
         public boolean prefsCanMakePayment() {
             // TODO(crbug.com/1128658): Try replacing Profile with BrowserContextHandle, which

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

@@ -58,7 +58,9 @@ import org.chromium.components.payments.Section;
 import org.chromium.components.payments.SkipToGPayHelper;
 import org.chromium.components.payments.UrlUtil;
 import org.chromium.content_public.browser.RenderFrameHost;
+import org.chromium.content_public.browser.Visibility;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.content_public.browser.WebContentsStatics;
 import org.chromium.payments.mojom.CanMakePaymentQueryResult;
 import org.chromium.payments.mojom.HasEnrolledInstrumentQueryResult;
 import org.chromium.payments.mojom.PayerDetail;
@@ -354,10 +356,22 @@ public class ChromePaymentRequestService
         return true;
     }
 
+    @Nullable
+    private WebContents getLiveWebContents() {
+        WebContents webContents = WebContentsStatics.fromRenderFrameHost(mRenderFrameHost);
+        return webContents != null && !webContents.isDestroyed() ? webContents : null;
+    }
+
+    private boolean isWebContentsActive() {
+        WebContents webContents = getLiveWebContents();
+        return webContents != null && webContents.getVisibility() == Visibility.VISIBLE;
+    }
+
     /** @return Whether the UI was built. */
     private boolean buildUI(ChromeActivity activity) {
+        WebContents webContents = getLiveWebContents();
         String error = mPaymentUiService.buildPaymentRequestUI(activity,
-                /*isWebContentsActive=*/mDelegate.isWebContentsActive(),
+                /*isWebContentsActive=*/isWebContentsActive(),
                 /*waitForUpdatedDetails=*/mWaitForUpdatedDetails);
         if (error != null) {
             mJourneyLogger.setNotShown(NotShownReason.OTHER);

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

@@ -37,9 +37,8 @@ public class PaymentRequestTestBridge {
         private final String mTwaPackageName;
 
         ChromePaymentRequestDelegateForTest(boolean isOffTheRecord, boolean isValidSsl,
-                boolean isWebContentsActive, boolean prefsCanMakePayment, String twaPackageName,
-                boolean skipUiForBasicCard) {
-            super(isOffTheRecord, isValidSsl, isWebContentsActive, prefsCanMakePayment);
+                boolean prefsCanMakePayment, String twaPackageName, boolean skipUiForBasicCard) {
+            super(isOffTheRecord, isValidSsl, prefsCanMakePayment);
             mSkipUiForBasicCard = skipUiForBasicCard;
             mTwaPackageName = twaPackageName;
         }
@@ -64,14 +63,12 @@ public class PaymentRequestTestBridge {
     private static class PaymentRequestDelegateForTest implements PaymentRequestService.Delegate {
         private final boolean mIsOffTheRecord;
         private final boolean mIsValidSsl;
-        private final boolean mIsWebContentsActive;
         private final boolean mPrefsCanMakePayment;
 
-        PaymentRequestDelegateForTest(boolean isOffTheRecord, boolean isValidSsl,
-                boolean isWebContentsActive, boolean prefsCanMakePayment) {
+        PaymentRequestDelegateForTest(
+                boolean isOffTheRecord, boolean isValidSsl, boolean prefsCanMakePayment) {
             mIsOffTheRecord = isOffTheRecord;
             mIsValidSsl = isValidSsl;
-            mIsWebContentsActive = isWebContentsActive;
             mPrefsCanMakePayment = prefsCanMakePayment;
         }
 
@@ -86,11 +83,6 @@ public class PaymentRequestTestBridge {
             return "Invalid SSL certificate";
         }
 
-        @Override
-        public boolean isWebContentsActive() {
-            return mIsWebContentsActive;
-        }
-
         @Override
         public boolean prefsCanMakePayment() {
             return mPrefsCanMakePayment;
@@ -210,12 +202,12 @@ public class PaymentRequestTestBridge {
 
     @CalledByNative
     private static void setUseDelegateForTest(boolean useDelegate, boolean isOffTheRecord,
-            boolean isValidSsl, boolean isWebContentsActive, boolean prefsCanMakePayment,
-            boolean skipUiForBasicCard, String twaPackageName) {
+            boolean isValidSsl, boolean prefsCanMakePayment, boolean skipUiForBasicCard,
+            String twaPackageName) {
         if (useDelegate) {
-            ChromePaymentRequestFactory.sDelegateForTest = new ChromePaymentRequestDelegateForTest(
-                    isOffTheRecord, isValidSsl, isWebContentsActive, prefsCanMakePayment,
-                    twaPackageName, skipUiForBasicCard);
+            ChromePaymentRequestFactory.sDelegateForTest =
+                    new ChromePaymentRequestDelegateForTest(isOffTheRecord, isValidSsl,
+                            prefsCanMakePayment, twaPackageName, skipUiForBasicCard);
         } else {
             ChromePaymentRequestFactory.sDelegateForTest = null;
         }

chrome/test/payments/android/payment_request_test_bridge.cc

@@ -16,14 +16,13 @@ void SetUseDelegateOnPaymentRequestForTesting(
     bool use_delegate,
     bool is_incognito,
     bool is_valid_ssl,
-    bool is_web_contents_active,
     bool prefs_can_make_payment,
     bool skip_ui_for_basic_card,
     const std::string& twa_package_name) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_PaymentRequestTestBridge_setUseDelegateForTest(
-      env, use_delegate, is_incognito, is_valid_ssl, is_web_contents_active,
-      prefs_can_make_payment, skip_ui_for_basic_card,
+      env, use_delegate, is_incognito, is_valid_ssl, prefs_can_make_payment,
+      skip_ui_for_basic_card,
       base::android::ConvertUTF8ToJavaString(env, twa_package_name));
 }
 

chrome/test/payments/android/payment_request_test_bridge.h

@@ -24,7 +24,6 @@ void SetUseDelegateOnPaymentRequestForTesting(
     bool use_delegate,
     bool is_incognito,
     bool is_valid_ssl,
-    bool is_web_contents_active,
     bool prefs_can_make_payment,
     bool skip_ui_for_basic_card,
     const std::string& twa_package_name);

chrome/test/payments/payment_request_test_controller_android.cc

@@ -79,7 +79,7 @@ void PaymentRequestTestController::SetUpOnMainThread() {
 
   SetUseDelegateOnPaymentRequestForTesting(
       /*use_delegate_for_test=*/true, is_off_the_record_, valid_ssl_,
-      /*is_browser_window_active=*/true, can_make_payment_pref_,
+      can_make_payment_pref_,
       /*skip_ui_for_basic_card=*/false, twa_package_name_);
 }
 
@@ -92,7 +92,7 @@ void PaymentRequestTestController::SetOffTheRecord(bool is_off_the_record) {
   is_off_the_record_ = is_off_the_record;
   SetUseDelegateOnPaymentRequestForTesting(
       /*use_delegate_for_test=*/true, is_off_the_record_, valid_ssl_,
-      /*is_browser_window_active=*/true, can_make_payment_pref_,
+      can_make_payment_pref_,
       /*skip_ui_for_basic_card=*/false, twa_package_name_);
 }
 
@@ -100,7 +100,7 @@ void PaymentRequestTestController::SetValidSsl(bool valid_ssl) {
   valid_ssl_ = valid_ssl;
   SetUseDelegateOnPaymentRequestForTesting(
       /*use_delegate_for_test=*/true, is_off_the_record_, valid_ssl_,
-      /*is_browser_window_active=*/true, can_make_payment_pref_,
+      can_make_payment_pref_,
       /*skip_ui_for_basic_card=*/false, twa_package_name_);
 }
 
@@ -109,7 +109,7 @@ void PaymentRequestTestController::SetCanMakePaymentEnabledPref(
   can_make_payment_pref_ = can_make_payment_enabled;
   SetUseDelegateOnPaymentRequestForTesting(
       /*use_delegate_for_test=*/true, is_off_the_record_, valid_ssl_,
-      /*is_browser_window_active=*/true, can_make_payment_pref_,
+      can_make_payment_pref_,
       /*skip_ui_for_basic_card=*/false, twa_package_name_);
 }
 
@@ -118,7 +118,7 @@ void PaymentRequestTestController::SetTwaPackageName(
   twa_package_name_ = twa_package_name;
   SetUseDelegateOnPaymentRequestForTesting(
       /*use_delegate_for_test=*/true, is_off_the_record_, valid_ssl_,
-      /*is_browser_window_active=*/true, can_make_payment_pref_,
+      can_make_payment_pref_,
       /*skip_ui_for_basic_card=*/false, twa_package_name_);
 }
 

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

@@ -114,11 +114,6 @@ public class PaymentRequestService {
          */
         String getInvalidSslCertificateErrorMessage();
 
-        /**
-         * @return True if the merchant's web contents that initiated the payment request is active.
-         */
-        boolean isWebContentsActive();
-
         /**
          * @return Whether the preferences allow CAN_MAKE_PAYMENT.
          */