Commit 5adef068 authored by Francois Doray's avatar Francois Doray Committed by Commit Bot

Re-enable TabManagerTest.ProactiveFastShutdownWith(Before)UnloadHandler.

Failures were due to a race in Mojo notifications for renderer
tear-down and setup. Let's see if the problem still exists.

Bug: 874851
Change-Id: Ia28012b8189a5236879abf444bac9295d9159453
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1972532
Commit-Queue: Chris Hamilton <chrisha@chromium.org>
Reviewed-by: default avatarChris Hamilton <chrisha@chromium.org>
Cr-Commit-Position: refs/heads/master@{#725966}
parent 0c84b3ab
...@@ -978,12 +978,11 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, UrgentFastShutdownSharedTabProcess) { ...@@ -978,12 +978,11 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, UrgentFastShutdownSharedTabProcess) {
"TabManager.Discarding.DiscardedTabCouldFastShutdown", false, 1); "TabManager.Discarding.DiscardedTabCouldFastShutdown", false, 1);
} }
IN_PROC_BROWSER_TEST_F(TabManagerTest, IN_PROC_BROWSER_TEST_F(TabManagerTest, ProactiveFastShutdownWithUnloadHandler) {
DISABLED_ProactiveFastShutdownWithUnloadHandler) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// Disable the protection of recent tabs. // Disable the protection of recent tabs.
OpenTwoTabs(GURL(chrome::kChromeUIAboutURL), OpenTwoTabs(embedded_test_server()->GetURL("a.com", "/title1.html"),
GURL(embedded_test_server()->GetURL("/unload.html"))); embedded_test_server()->GetURL("/unload.html"));
// Advance time so everything is urgent discardable. // Advance time so everything is urgent discardable.
test_clock_.Advance(kBackgroundUrgentProtectionTime); test_clock_.Advance(kBackgroundUrgentProtectionTime);
...@@ -1003,8 +1002,8 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, ...@@ -1003,8 +1002,8 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest,
IN_PROC_BROWSER_TEST_F(TabManagerTest, UrgentFastShutdownWithUnloadHandler) { IN_PROC_BROWSER_TEST_F(TabManagerTest, UrgentFastShutdownWithUnloadHandler) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// Disable the protection of recent tabs. // Disable the protection of recent tabs.
OpenTwoTabs(GURL(chrome::kChromeUIAboutURL), OpenTwoTabs(embedded_test_server()->GetURL("a.com", "/title1.html"),
GURL(embedded_test_server()->GetURL("/unload.html"))); embedded_test_server()->GetURL("/unload.html"));
// Advance time so everything is urgent discardable. // Advance time so everything is urgent discardable.
test_clock_.Advance(kBackgroundUrgentProtectionTime); test_clock_.Advance(kBackgroundUrgentProtectionTime);
...@@ -1039,8 +1038,8 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, ...@@ -1039,8 +1038,8 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest,
DISABLED_ProactiveFastShutdownWithBeforeunloadHandler) { DISABLED_ProactiveFastShutdownWithBeforeunloadHandler) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// Disable the protection of recent tabs. // Disable the protection of recent tabs.
OpenTwoTabs(GURL(chrome::kChromeUIAboutURL), OpenTwoTabs(embedded_test_server()->GetURL("a.com", "/title1.html"),
GURL(embedded_test_server()->GetURL("/beforeunload.html"))); embedded_test_server()->GetURL("/beforeunload.html"));
// Advance time so everything is urgent discardable. // Advance time so everything is urgent discardable.
test_clock_.Advance(kBackgroundUrgentProtectionTime); test_clock_.Advance(kBackgroundUrgentProtectionTime);
...@@ -1061,8 +1060,8 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, ...@@ -1061,8 +1060,8 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest,
UrgentFastShutdownWithBeforeunloadHandler) { UrgentFastShutdownWithBeforeunloadHandler) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// Disable the protection of recent tabs. // Disable the protection of recent tabs.
OpenTwoTabs(GURL(chrome::kChromeUIAboutURL), OpenTwoTabs(embedded_test_server()->GetURL("a.com", "/title1.html"),
GURL(embedded_test_server()->GetURL("/beforeunload.html"))); embedded_test_server()->GetURL("/beforeunload.html"));
// Advance time so everything is urgent discardable. // Advance time so everything is urgent discardable.
test_clock_.Advance(kBackgroundUrgentProtectionTime); test_clock_.Advance(kBackgroundUrgentProtectionTime);
......
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