commit c8543421cf4382af7da64a618edfb36fa2d9a363
author Marijn Kruisselbrink <mek@chromium.org> Fri Jan 10 18:17:40 2025
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jan 10 18:17:40 2025
tree 76faac32d0205cf688f547e9104e5cc92b488227
parent d50794d18b7fd758f3997fdb4c70a7767b4f5b7e

[PWA] Remove unnecessary wait-for-active in NewPopup test.

Nothing in this test requires certain browsers to be active,
so remove the not needed and flaky wait-for-active code.

Bug: 383123307
Change-Id: I367df9531d3dbd34970368f4f2471eb044db3bd6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6165823
Auto-Submit: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: Dibyajyoti Pal <dibyapal@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1404879}

chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc

diff --git a/chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc b/chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc
index 6e22a627..b5148baa 100644
--- a/chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc
+++ b/chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc
@@ -30,18 +30,6 @@
   }
 };
 
-namespace {
-
-// Navigate and wait until the browse becomes active.
-// Returns the active browser.
-Browser* NavigateAndWaitUntilBrowserBecomeActive(NavigateParams* params) {
-  Navigate(params);
-  ui_test_utils::WaitUntilBrowserBecomeActive(params->browser);
-  return params->browser;
-}
-
-}  // namespace
-
 // This test verifies that navigating with "open_pwa_window_if_possible = true"
 // opens a new app window if there is an installed Web App for the URL.
 IN_PROC_BROWSER_TEST_F(WebAppNavigateBrowserTest,
@@ -101,7 +89,8 @@
     NavigateParams params(MakeNavigateParams());
     params.disposition = WindowOpenDisposition::NEW_WINDOW;
     params.open_pwa_window_if_possible = true;
-    active_browser = NavigateAndWaitUntilBrowserBecomeActive(&params);
+    Navigate(&params);
+    active_browser = params.browser;
   }
   Browser* const app_browser = active_browser;
   const webapps::AppId app_id = app_browser->app_controller()->app_id();
@@ -110,7 +99,8 @@
     NavigateParams params(MakeNavigateParams());
     params.disposition = WindowOpenDisposition::NEW_WINDOW;
     params.app_id = app_id;
-    active_browser = NavigateAndWaitUntilBrowserBecomeActive(&params);
+    Navigate(&params);
+    active_browser = params.browser;
   }
   content::WebContents* const web_contents =
       active_browser->tab_strip_model()->GetActiveWebContents();
@@ -120,7 +110,8 @@
     NavigateParams params(MakeNavigateParams());
     params.disposition = WindowOpenDisposition::NEW_POPUP;
     params.source_contents = web_contents;
-    active_browser = NavigateAndWaitUntilBrowserBecomeActive(&params);
+    Navigate(&params);
+    active_browser = params.browser;
     EXPECT_FALSE(active_browser->app_controller());
   }
 
@@ -129,7 +120,8 @@
     NavigateParams params(MakeNavigateParams());
     params.app_id = app_id;
     params.disposition = WindowOpenDisposition::NEW_POPUP;
-    active_browser = NavigateAndWaitUntilBrowserBecomeActive(&params);
+    Navigate(&params);
+    active_browser = params.browser;
     EXPECT_EQ(active_browser->app_controller()->app_id(), app_id);
   }
 
@@ -138,7 +130,8 @@
     NavigateParams params(MakeNavigateParams());
     params.browser = app_browser;
     params.disposition = WindowOpenDisposition::NEW_POPUP;
-    active_browser = NavigateAndWaitUntilBrowserBecomeActive(&params);
+    Navigate(&params);
+    active_browser = params.browser;
     EXPECT_EQ(active_browser->app_controller()->app_id(), app_id);
   }
 }