Commit e0f3890d authored by Ulan Degenbaev's avatar Ulan Degenbaev Committed by Commit Bot

Re-enable ClearPendingWebUIOnCommit / Android / ASan

Bug: 428329
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: Ia439ef4ba035d4d8fb038aa0703ea9e6f93e3e89
Reviewed-on: https://chromium-review.googlesource.com/583447Reviewed-by: default avatarEgor Pasko <pasko@chromium.org>
Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490730}
parent bc0a64ab
...@@ -1884,18 +1884,10 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, ...@@ -1884,18 +1884,10 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
EXPECT_TRUE(shell()->web_contents()->GetController().CanGoForward()); EXPECT_TRUE(shell()->web_contents()->GetController().CanGoForward());
} }
// The test fails with Android ASAN with changes in v8 that seem unrelated.
// See http://crbug.com/428329.
#if defined(OS_ANDROID) && defined(THREAD_SANITIZER)
#define MAYBE_ClearPendingWebUIOnCommit DISABLED_ClearPendingWebUIOnCommit
#else
#define MAYBE_ClearPendingWebUIOnCommit ClearPendingWebUIOnCommit
#endif
// Ensure that pending_and_current_web_ui_ is cleared when a URL commits. // Ensure that pending_and_current_web_ui_ is cleared when a URL commits.
// Otherwise it might get picked up by InitRenderView when granting bindings // Otherwise it might get picked up by InitRenderView when granting bindings
// to other RenderViewHosts. See http://crbug.com/330811. // to other RenderViewHosts. See http://crbug.com/330811.
IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, ClearPendingWebUIOnCommit) {
MAYBE_ClearPendingWebUIOnCommit) {
// Visit a WebUI page with bindings. // Visit a WebUI page with bindings.
GURL webui_url(GURL(std::string(kChromeUIScheme) + "://" + GURL webui_url(GURL(std::string(kChromeUIScheme) + "://" +
std::string(kChromeUIGpuHost))); std::string(kChromeUIGpuHost)));
......
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