Commit 4d3b38f1 authored by Eric Willigers's avatar Eric Willigers Committed by Commit Bot

Enable ContextMenuBrowserTest test

OpenInAppAbsentForURLsInNonLocallyInstalledApp was flaky.

We re-enable the test, after addressing two causes of test
flakiness:
- https://chromium-review.googlesource.com/c/chromium/src/+/2454920
- https://chromium-review.googlesource.com/c/chromium/src/+/2454811


Bug: 1119807
Change-Id: Iee88737a8bf5545358fa63bce3a5ceee65330426
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2459134Reviewed-by: default avatarDaniel Murphy <dmurph@chromium.org>
Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Auto-Submit: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815283}
parent 6bca3b0c
...@@ -513,23 +513,10 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, ...@@ -513,23 +513,10 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest,
IDC_OPEN_LINK_IN_PROFILE_LAST)); IDC_OPEN_LINK_IN_PROFILE_LAST));
} }
// Flaky crashes on Windows and Chrome OS. https://crbug.com/1119807
#if defined(OS_WIN) || defined(OS_CHROMEOS)
#define MAYBE_OpenInAppAbsentForURLsInNonLocallyInstalledApp \
DISABLED_OpenInAppAbsentForURLsInNonLocallyInstalledApp
#else
#define MAYBE_OpenInAppAbsentForURLsInNonLocallyInstalledApp \
OpenInAppAbsentForURLsInNonLocallyInstalledApp
#endif
IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest,
MAYBE_OpenInAppAbsentForURLsInNonLocallyInstalledApp) { OpenInAppAbsentForURLsInNonLocallyInstalledApp) {
const AppId app_id = InstallTestWebApp(GURL(kAppUrl1)); const AppId app_id = InstallTestWebApp(GURL(kAppUrl1));
// Part of the installation process (setting that this is a locally installed
// app) runs asynchronously. Wait for that to complete before setting locally
// installed to false.
base::RunLoop().RunUntilIdle();
{ {
WebAppProviderBase* const provider = WebAppProviderBase* const provider =
WebAppProviderBase::GetProviderBase(browser()->profile()); WebAppProviderBase::GetProviderBase(browser()->profile());
...@@ -544,7 +531,6 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, ...@@ -544,7 +531,6 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest,
})); }));
run_loop.Run(); run_loop.Run();
base::RunLoop().RunUntilIdle();
} }
std::unique_ptr<TestRenderViewContextMenu> menu = std::unique_ptr<TestRenderViewContextMenu> menu =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment