Commit 96eff6ba authored by Rakina Zata Amni's avatar Rakina Zata Amni Committed by Commit Bot

Remove CrossProcessNavigation from worker NetworkIsolationKey tests

We don't need them, and they're also causing failures in the bfcache
bot.

Change-Id: I60ed51a01efd0938192969d9cf116915f01df70b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1886071Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Commit-Queue: Rakina Zata Amni <rakina@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710707}
parent 3ecce57a
...@@ -42,23 +42,6 @@ class WorkerNetworkIsolationKeyBrowserTest : public ContentBrowserTest { ...@@ -42,23 +42,6 @@ class WorkerNetworkIsolationKeyBrowserTest : public ContentBrowserTest {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
} }
// Does a cross-process navigation to clear the in-memory cache.
// We are relying on this navigation to discard the old process.
void CrossProcessNavigation() {
// Content browsertests start on a blank page where the process may be
// reused for subsequent navigations. Since this function may be called in
// such a state, first perform a navigation that will "use up" the blank
// process and then navigate to a WebUI which will require a process swap.
EXPECT_TRUE(
NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html")));
RenderProcessHost* process =
shell()->web_contents()->GetMainFrame()->GetProcess();
RenderProcessHostWatcher process_watcher(
process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
EXPECT_TRUE(NavigateToURL(shell(), GetWebUIURL("gpu")));
process_watcher.Wait();
}
// Register a service/shared worker |main_script_file| in the scope of // Register a service/shared worker |main_script_file| in the scope of
// |subframe_rfh|'s origin. // |subframe_rfh|'s origin.
void RegisterWorker(RenderFrameHost* subframe_rfh, void RegisterWorker(RenderFrameHost* subframe_rfh,
...@@ -194,9 +177,6 @@ IN_PROC_BROWSER_TEST_P( ...@@ -194,9 +177,6 @@ IN_PROC_BROWSER_TEST_P(
if (worker_type == WorkerType::kSharedWorker && !SupportsSharedWorker()) if (worker_type == WorkerType::kSharedWorker && !SupportsSharedWorker())
return; return;
// Discard the old process to clear the in-memory cache.
CrossProcessNavigation();
net::EmbeddedTestServer cross_origin_server_1; net::EmbeddedTestServer cross_origin_server_1;
cross_origin_server_1.ServeFilesFromSourceDirectory(GetTestDataFilePath()); cross_origin_server_1.ServeFilesFromSourceDirectory(GetTestDataFilePath());
ASSERT_TRUE(cross_origin_server_1.Start()); ASSERT_TRUE(cross_origin_server_1.Start());
...@@ -299,9 +279,6 @@ class ServiceWorkerMainScriptRequestNetworkIsolationKeyBrowserTest ...@@ -299,9 +279,6 @@ class ServiceWorkerMainScriptRequestNetworkIsolationKeyBrowserTest
IN_PROC_BROWSER_TEST_P( IN_PROC_BROWSER_TEST_P(
ServiceWorkerMainScriptRequestNetworkIsolationKeyBrowserTest, ServiceWorkerMainScriptRequestNetworkIsolationKeyBrowserTest,
ServiceWorkerMainScriptRequest) { ServiceWorkerMainScriptRequest) {
// Discard the old process to clear the in-memory cache.
CrossProcessNavigation();
net::EmbeddedTestServer subframe_server; net::EmbeddedTestServer subframe_server;
subframe_server.ServeFilesFromSourceDirectory(GetTestDataFilePath()); subframe_server.ServeFilesFromSourceDirectory(GetTestDataFilePath());
ASSERT_TRUE(subframe_server.Start()); ASSERT_TRUE(subframe_server.Start());
...@@ -383,9 +360,6 @@ IN_PROC_BROWSER_TEST_P( ...@@ -383,9 +360,6 @@ IN_PROC_BROWSER_TEST_P(
if (!SupportsSharedWorker()) if (!SupportsSharedWorker())
return; return;
// Discard the old process to clear the in-memory cache.
CrossProcessNavigation();
net::EmbeddedTestServer subframe_server; net::EmbeddedTestServer subframe_server;
subframe_server.ServeFilesFromSourceDirectory(GetTestDataFilePath()); subframe_server.ServeFilesFromSourceDirectory(GetTestDataFilePath());
ASSERT_TRUE(subframe_server.Start()); ASSERT_TRUE(subframe_server.Start());
......
...@@ -20,12 +20,9 @@ ...@@ -20,12 +20,9 @@
# Test expects the RenderFrameHost to be deleted after a navigation. It is now # Test expects the RenderFrameHost to be deleted after a navigation. It is now
# stored into the BackForwardCache instead. It isn't deleted. # stored into the BackForwardCache instead. It isn't deleted.
-RenderFrameHostManagerTest.CleanupOnCrossProcessNavigation -RenderFrameHostManagerTest.CleanupOnCrossProcessNavigation
-ServiceWorkerMainScriptRequestNetworkIsolationKeyBrowserTest.ServiceWorkerMainScriptRequest/*
-SharedWorkerMainScriptRequestNetworkIsolationKeyBrowserTest.SharedWorkerMainScriptRequest/*
-SitePerProcessBrowserTest.PendingDeletionCheckCompletedOnSubtree -SitePerProcessBrowserTest.PendingDeletionCheckCompletedOnSubtree
-SitePerProcessBrowserTest.SlowUnloadHandlerInIframe -SitePerProcessBrowserTest.SlowUnloadHandlerInIframe
-WebContentsBindingSetBrowserTest.CloseOnFrameDeletion -WebContentsBindingSetBrowserTest.CloseOnFrameDeletion
-WorkerImportScriptsAndFetchRequestNetworkIsolationKeyBrowserTest.ImportScriptsAndFetchRequest/*
# Wait for the old process to exit. It won't, because it is still used by a # Wait for the old process to exit. It won't, because it is still used by a
# bfcached document. # bfcached document.
......
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