From 4157c6eaf49a5997aaa91f20e30e9d500281b910 Mon Sep 17 00:00:00 2001
From: Josh Karlin <jkarlin@chromium.org>
Date: Mon, 15 Jun 2026 06:59:59 -0700
Subject: [PATCH] Properly dismiss pending AdsBlockedDialog

If an AdsBlockedDialog is asynchronously waiting to be shown and is
dismissed, properly remove the callback from the dialog handler so that
it isn't referenced after dismissal.

Also fix a reentrancy bug where native dismissal in java wound up
calling back to native.

Bug: 522561151
Change-Id: Iba17be04c23bd7db2222f9d0be2b4cfb766ee818
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7926527
Reviewed-by: Charles Harrison <csharrison@chromium.org>
Commit-Queue: Josh Karlin <jkarlin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1646774}
---

diff --git a/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialog.java b/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialog.java
index 76a06d7..3e766acd 100644
--- a/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialog.java
+++ b/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialog.java
@@ -43,6 +43,7 @@
     private @Nullable PropertyModel mDialogModel;
     private @Nullable ClickableSpan mClickableSpan;
     private final Handler mDialogHandler;
+    private boolean mDismissedByNative;
 
     @CalledByNative
     static AdsBlockedDialog create(long nativeDialog, WindowAndroid windowAndroid) {
@@ -135,7 +136,15 @@
 
     @CalledByNative
     void dismiss() {
-        mModalDialogManager.dismissDialog(mDialogModel, DialogDismissalCause.DISMISSED_BY_NATIVE);
+        mDismissedByNative = true;
+        if (mDialogModel != null) {
+            mModalDialogManager.dismissDialog(
+                    mDialogModel, DialogDismissalCause.DISMISSED_BY_NATIVE);
+        }
+        if (mNativeDialog != 0) {
+            mDialogHandler.removeCallbacksAndMessages(null);
+            mNativeDialog = 0;
+        }
     }
 
     // Returns link-formatted message text for the ads blocked dialog.
@@ -167,7 +176,9 @@
     @Override
     public void onDismiss(PropertyModel model, @DialogDismissalCause int dismissalCause) {
         mDialogHandler.removeCallbacksAndMessages(null);
-        AdsBlockedDialogJni.get().onDismissed(mNativeDialog);
+        if (!mDismissedByNative && mNativeDialog != 0) {
+            AdsBlockedDialogJni.get().onDismissed(mNativeDialog);
+        }
         mNativeDialog = 0;
     }
 
diff --git a/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialogTest.java b/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialogTest.java
index 5a5fba8..3e243b8 100644
--- a/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialogTest.java
+++ b/components/subresource_filter/android/java/src/org/chromium/components/subresource_filter/AdsBlockedDialogTest.java
@@ -133,6 +133,49 @@
         Mockito.verify(mNativeMock).onLearnMoreClicked(anyLong());
     }
 
+    /**
+     * Tests that dismissing a pending dialog (not yet shown by ModalDialogManager) correctly runs
+     * the cleanup path manually.
+     */
+    @Test
+    public void testDismissPendingDialogCleansUp() {
+        createAndShowDialog(true);
+        mDialog.dismiss();
+        Mockito.verify(mDialogHandler).removeCallbacksAndMessages(null);
+        Mockito.verify(mNativeMock, never()).onDismissed(anyLong());
+    }
+
+    /**
+     * Tests that dismissing a showing dialog delegates dismissal to ModalDialogManager and does not
+     * perform manual cleanup twice.
+     */
+    @Test
+    public void testDismissShowingDialogDelegatesToManager() {
+        createAndShowDialog(false);
+        // Stub dismissDialog to simulate the manager calling onDismiss synchronously
+        Mockito.doAnswer(
+                        invocation -> {
+                            ModalDialogProperties.Controller dialogController =
+                                    mModalDialogModel.get(ModalDialogProperties.CONTROLLER);
+                            dialogController.onDismiss(
+                                    mModalDialogModel, DialogDismissalCause.DISMISSED_BY_NATIVE);
+                            return null;
+                        })
+                .when(mModalDialogManagerMock)
+                .dismissDialog(Mockito.any(), Mockito.anyInt());
+
+        mDialog.dismiss();
+
+        // Verify that the manager's dismissDialog was called
+        Mockito.verify(mModalDialogManagerMock)
+                .dismissDialog(mModalDialogModel, DialogDismissalCause.DISMISSED_BY_NATIVE);
+
+        // Verify that Java doesn't call back to native's onDismissed when handling a native
+        // dismissal.
+        Mockito.verify(mNativeMock, never()).onDismissed(anyLong());
+        Mockito.verify(mDialogHandler, Mockito.times(1)).removeCallbacksAndMessages(null);
+    }
+
     /** Tests that the dialog is shown using Handler#post when shouldPostDialog is true. */
     @Test
     public void testPostDialog() {