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

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

Issue 1270843002: PlzNavigate: disable RenderFrameHostManagerTest::PageDoesBackAndReload. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | no next file » | 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_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index 5c093da4839e1352cde8f043cf96c6591a6e675e..791874aa22d9689ff6e0c91c8cf45683d35c4986 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -1216,6 +1216,21 @@ TEST_F(RenderFrameHostManagerTest, WebUIWasCleared) {
// Also tests that only user-gesture navigations can interrupt cross-process
// navigations. http://crbug.com/75195
TEST_F(RenderFrameHostManagerTest, PageDoesBackAndReload) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableBrowserSideNavigation)) {
+ // PlzNavigate follows a significantly different logic for renderer
Charlie Reis 2015/08/03 17:59:42 s/logic/path/ ("follows a...path" or "uses...logi
carlosk 2015/08/03 18:45:00 Done using "uses...logic".
+ // initialed navigations and navigation cancellation. Adapting this test
+ // would make it full of special cases and almost unreadable.
+ // There are tests that exercise these concerns for PlzNavigate, all from
+ // NavigatorTestWithBrowserSideNavigation:
+ // - BrowserInitiatedNavigationCancel
+ // - RendererUserInitiatedNavigationCancel
+ // - RendererNonUserInitiatedNavigationDoesntCancelRendererUserInitiated
+ // - RendererNonUserInitiatedNavigationDoesntCancelBrowserInitiated
+ // - RendererNonUserInitiatedNavigationCancelSimilarNavigation
+ SUCCEED() << "Test is not applicable with browser side navigation enabled";
Charlie Reis 2015/08/03 17:59:42 We've just been returning early when tests don't a
carlosk 2015/08/03 18:45:00 It is not necessary and is currently purely for do
+ return;
+ }
const GURL kUrl1("http://www.google.com/");
const GURL kUrl2("http://www.evil-site.com/");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698