Skip to content

GitLab

T
tangled
Commit 7b020213 authored by clamy's avatar clamy Committed by Commit bot
Browse files
Options

PlzNavigate: fix several failing NavigationControllerTests 

https://codereview.chromium.org/1777903003 introduced several calls to
TestRenderFrameHost::PrepareForCommit without calling
TestRenderFrameHost::SendRendererInitiatedNavigationRequest when simulating
renderer initiated navigations. This makes them fail with PlzNavigate enabled.
This CL fixes this fact.

BUG=439423
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Review URL: https://codereview.chromium.org/1800123002

Cr-Commit-Position: refs/heads/master@{#381726}
parent 393a31d6
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 3 deletions
content/browser/frame_host/navigation_controller_impl_unittest.cc
View file @ 7b020213
...@@ -2125,6 +2125,7 @@ TEST_F(NavigationControllerTest, NewSubframe) { ...@@ -2125,6 +2125,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {
params.page_state = PageState::CreateFromURL(subframe_url); params.page_state = PageState::CreateFromURL(subframe_url);
// Navigating should do nothing. // Navigating should do nothing.
subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(0U, notifications.size());
...@@ -2144,6 +2145,7 @@ TEST_F(NavigationControllerTest, NewSubframe) { ...@@ -2144,6 +2145,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {
params.page_state = PageState::CreateFromURL(url2); params.page_state = PageState::CreateFromURL(url2);
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
subframe->SendRendererInitiatedNavigationRequest(url2, true);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
EXPECT_EQ(1U, navigation_entry_committed_counter_); EXPECT_EQ(1U, navigation_entry_committed_counter_);
...@@ -2207,6 +2209,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) { ...@@ -2207,6 +2209,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
params.page_state = PageState::CreateFromURL(url2); params.page_state = PageState::CreateFromURL(url2);
// Navigating should do nothing. // Navigating should do nothing.
subframe->SendRendererInitiatedNavigationRequest(url2, false);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(0U, notifications.size());
...@@ -2253,6 +2256,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) { ...@@ -2253,6 +2256,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
params.page_state = PageState::CreateFromURL(url3); params.page_state = PageState::CreateFromURL(url3);
// Navigating should do nothing. // Navigating should do nothing.
subframe2->SendRendererInitiatedNavigationRequest(url3, false);
subframe2->PrepareForCommit(); subframe2->PrepareForCommit();
subframe2->SendNavigateWithParams(&params); subframe2->SendNavigateWithParams(&params);
EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(0U, notifications.size());
...@@ -2304,6 +2308,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) { ...@@ -2304,6 +2308,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
params.page_state = PageState::CreateFromURL(url4); params.page_state = PageState::CreateFromURL(url4);
// Navigating should do nothing. // Navigating should do nothing.
subframe3->SendRendererInitiatedNavigationRequest(url4, false);
subframe3->PrepareForCommit(); subframe3->PrepareForCommit();
subframe3->SendNavigateWithParams(&params); subframe3->SendNavigateWithParams(&params);
EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(0U, notifications.size());
...@@ -2365,6 +2370,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { ...@@ -2365,6 +2370,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
params.page_state = PageState::CreateFromURL(subframe_url); params.page_state = PageState::CreateFromURL(subframe_url);
// Navigating should do nothing. // Navigating should do nothing.
subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
EXPECT_EQ(0U, notifications.size()); EXPECT_EQ(0U, notifications.size());
...@@ -2384,6 +2390,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { ...@@ -2384,6 +2390,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
params.page_state = PageState::CreateFromURL(url2); params.page_state = PageState::CreateFromURL(url2);
// This should generate a new entry. // This should generate a new entry.
subframe->SendRendererInitiatedNavigationRequest(url2, false);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry(); NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();
...@@ -2409,6 +2416,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { ...@@ -2409,6 +2416,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
params.url = url3; params.url = url3;
params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
params.page_state = PageState::CreateFromURL(url3); params.page_state = PageState::CreateFromURL(url3);
subframe->SendRendererInitiatedNavigationRequest(url3, false);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
EXPECT_EQ(1U, navigation_entry_committed_counter_); EXPECT_EQ(1U, navigation_entry_committed_counter_);
...@@ -2516,6 +2524,7 @@ TEST_F(NavigationControllerTest, InPage) { ...@@ -2516,6 +2524,7 @@ TEST_F(NavigationControllerTest, InPage) {
self_params.was_within_same_page = true; self_params.was_within_same_page = true;
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
main_test_rfh()->SendRendererInitiatedNavigationRequest(url1, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&self_params); main_test_rfh()->SendNavigateWithParams(&self_params);
NavigationEntry* entry1 = controller.GetLastCommittedEntry(); NavigationEntry* entry1 = controller.GetLastCommittedEntry();
...@@ -2540,6 +2549,7 @@ TEST_F(NavigationControllerTest, InPage) { ...@@ -2540,6 +2549,7 @@ TEST_F(NavigationControllerTest, InPage) {
params.was_within_same_page = true; params.was_within_same_page = true;
// This should generate a new entry. // This should generate a new entry.
main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
NavigationEntry* entry2 = controller.GetLastCommittedEntry(); NavigationEntry* entry2 = controller.GetLastCommittedEntry();
...@@ -2602,6 +2612,7 @@ TEST_F(NavigationControllerTest, InPage) { ...@@ -2602,6 +2612,7 @@ TEST_F(NavigationControllerTest, InPage) {
params.did_create_new_entry = true; params.did_create_new_entry = true;
params.url = url3; params.url = url3;
navigation_entry_committed_counter_ = 0; navigation_entry_committed_counter_ = 0;
main_test_rfh()->SendRendererInitiatedNavigationRequest(url3, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
EXPECT_EQ(1U, navigation_entry_committed_counter_); EXPECT_EQ(1U, navigation_entry_committed_counter_);
...@@ -2638,6 +2649,7 @@ TEST_F(NavigationControllerTest, InPage_Replace) { ...@@ -2638,6 +2649,7 @@ TEST_F(NavigationControllerTest, InPage_Replace) {
// This should NOT generate a new entry, nor prune the list. // This should NOT generate a new entry, nor prune the list.
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
EXPECT_EQ(1U, navigation_entry_committed_counter_); EXPECT_EQ(1U, navigation_entry_committed_counter_);
...@@ -2692,6 +2704,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) { ...@@ -2692,6 +2704,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) {
// This should NOT generate a new entry, nor prune the list. // This should NOT generate a new entry, nor prune the list.
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
EXPECT_EQ(1U, navigation_entry_committed_counter_); EXPECT_EQ(1U, navigation_entry_committed_counter_);
...@@ -2719,6 +2732,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) { ...@@ -2719,6 +2732,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) {
// This SHOULD generate a new entry. // This SHOULD generate a new entry.
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
EXPECT_EQ(1U, navigation_entry_committed_counter_); EXPECT_EQ(1U, navigation_entry_committed_counter_);
...@@ -3806,6 +3820,7 @@ TEST_F(NavigationControllerTest, SameSubframe) { ...@@ -3806,6 +3820,7 @@ TEST_F(NavigationControllerTest, SameSubframe) {
params.gesture = NavigationGestureAuto; params.gesture = NavigationGestureAuto;
params.is_post = false; params.is_post = false;
params.page_state = PageState::CreateFromURL(subframe_url); params.page_state = PageState::CreateFromURL(subframe_url);
subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
...@@ -3975,6 +3990,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) { ...@@ -3975,6 +3990,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) {
params.page_state = PageState::CreateFromURL(url1_sub); params.page_state = PageState::CreateFromURL(url1_sub);
// This should return false meaning that nothing was actually updated. // This should return false meaning that nothing was actually updated.
subframe->SendRendererInitiatedNavigationRequest(url1_sub, false);
subframe->PrepareForCommit(); subframe->PrepareForCommit();
subframe->SendNavigateWithParams(&params); subframe->SendNavigateWithParams(&params);
...@@ -5053,6 +5069,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) { ...@@ -5053,6 +5069,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) {
// Navigate to new page. // Navigate to new page.
{ {
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
EXPECT_EQ(PAGE_TYPE_ERROR, EXPECT_EQ(PAGE_TYPE_ERROR,
...@@ -5064,6 +5081,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) { ...@@ -5064,6 +5081,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) {
{ {
params.did_create_new_entry = false; params.did_create_new_entry = false;
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
EXPECT_EQ(PAGE_TYPE_ERROR, EXPECT_EQ(PAGE_TYPE_ERROR,
...@@ -5093,6 +5111,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) { ...@@ -5093,6 +5111,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) {
params.was_within_same_page = true; params.was_within_same_page = true;
{ {
LoadCommittedDetailsObserver observer(contents()); LoadCommittedDetailsObserver observer(contents());
main_test_rfh()->SendRendererInitiatedNavigationRequest(params.url, false);
main_test_rfh()->PrepareForCommit(); main_test_rfh()->PrepareForCommit();
main_test_rfh()->SendNavigateWithParams(&params); main_test_rfh()->SendNavigateWithParams(&params);
EXPECT_EQ(PAGE_TYPE_ERROR, EXPECT_EQ(PAGE_TYPE_ERROR,
......
testing/buildbot/filters/browser-side-navigation.linux.content_unittests.filter
View file @ 7b020213
-NavigationControllerTest.IsInPageNavigation -NavigationControllerTest.BackSubframe
-NavigationControllerTest.IsInPageNavigationWithUniversalFileAccess -NavigationControllerTest.DontDiscardWrongPendingEntry
-NavigationControllerTest.LoadURL_RedirectAbortDoesntShowPendingURL
-RenderFrameHostManagerTest.RestoreNavigationToWebUI -RenderFrameHostManagerTest.RestoreNavigationToWebUI
-RenderFrameHostManagerTest.SimultaneousNavigationWithOneWebUI1 -RenderFrameHostManagerTest.SimultaneousNavigationWithOneWebUI1
-RenderFrameHostManagerTest.SimultaneousNavigationWithOneWebUI2 -RenderFrameHostManagerTest.SimultaneousNavigationWithOneWebUI2
......
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