Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1269)

Unified Diff: content/browser/frame_host/render_frame_host_manager_browsertest.cc

Issue 1891223002: PlzNavigate: fix RFHM test SameOriginFramesInDifferentProcesses (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
index 7bc7c1c24f6e19b11b922697851a2db16273ead1..e994394ec642fd3a0fcfd723dbab64af3247e2d3 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -2654,9 +2654,11 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
// a.com window.
NavigateToURL(new_shell, embedded_test_server()->GetURL(
"b.com", "/cross-site/a.com/title1.html"));
- if (AreAllSitesIsolatedForTesting()) {
+ if (AreAllSitesIsolatedForTesting() || IsBrowserSideNavigationEnabled()) {
// In --site-per-process mode, both windows will actually be in the same
// process.
+ // PlzNavigate: the SiteInstance for the navigation is determined after the
+ // redirect. So both windows will actually be in the same process.
EXPECT_EQ(shell()->web_contents()->GetSiteInstance(),
new_shell->web_contents()->GetSiteInstance());
} else {
@@ -2675,7 +2677,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
" }\n"
"})())",
&result));
- if (AreAllSitesIsolatedForTesting()) {
+ if (AreAllSitesIsolatedForTesting() || IsBrowserSideNavigationEnabled()) {
EXPECT_THAT(result,
::testing::MatchesRegex("http://a.com:\\d+/title1.html"));
} else {
« no previous file with comments | « no previous file | testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698