Commit bd44869f authored by jam's avatar jam Committed by Commit bot

Don't run the prerendering tests that verify prerendering is cancelled for...

Don't run the prerendering tests that verify prerendering is cancelled for cross-process navigations under PlzNavigate.

Prerendering has these tests since it requires only one render process is used for prerendering. Without PlzNavigate, it detects a cross-process navigation and cancels prerendering. However with PlzNavigate, this scenario doesn't exist since we only determine the (one) render process to use for prerendering after redirects have been followed.

This fixes
PrerenderBrowserTest.PrerenderCrossProcessServerRedirect
PrerenderBrowserTest.PrerenderCrossProcessServerRedirectNoHang
with PlzNavigate.

BUG=504347

Review-Url: https://codereview.chromium.org/2560933002
Cr-Commit-Position: refs/heads/master@{#437490}
parent 604a3c83
......@@ -91,6 +91,7 @@
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/browser_side_navigation_policy.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/resource_request_body.h"
#include "content/public/common/url_constants.h"
......@@ -2834,6 +2835,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCapturedWebContents) {
// a server redirect.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
PrerenderCrossProcessServerRedirect) {
// Cross-process navigations don't happen for prerendering with PlzNavigate,
// since we decide on a process after redirects are followed.
if (content::IsBrowserSideNavigationEnabled())
return;
// Force everything to be a process swap.
SwapProcessesContentBrowserClient test_browser_client;
content::ContentBrowserClient* original_browser_client =
......@@ -2851,6 +2857,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
// See http://crbug.com/341134
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
PrerenderCrossProcessServerRedirectNoHang) {
// Cross-process navigations don't happen for prerendering with PlzNavigate,
// since we decide on a process after redirects are followed.
if (content::IsBrowserSideNavigationEnabled())
return;
const char kDestPath[] = "/prerender/prerender_page.html";
// Force everything to be a process swap.
SwapProcessesContentBrowserClient test_browser_client;
......
......@@ -2,8 +2,6 @@
-PDFExtensionTest.PdfAccessibilityInOOPIF
-PlatformAppUrlRedirectorBrowserTest.PrerenderedClickInTabIntercepted
-PredictorBrowserTest.RendererInitiatedNavigationPreconnect
-PrerenderBrowserTest.PrerenderCrossProcessServerRedirect
-PrerenderBrowserTest.PrerenderCrossProcessServerRedirectNoHang
-ThreatDOMDetailsTest.Everything
# https://crbug.com/652767: NavigationHandle::GetResponseHeaders sometimes
......
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