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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 2560933002: Don't run the prerendering tests that verify prerendering is cancelled for cross-process navigation… (Closed)
Patch Set: merge Created 4 years 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.browser_tests.filter » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 4cc65f26f0c70fb3de78db9414da5ce985288869..9956202fd38c3e2a1faba9a100a6c2a5ea7114da 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -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;
« no previous file with comments | « no previous file | testing/buildbot/filters/browser-side-navigation.linux.browser_tests.filter » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698