content/browser/frame_host/navigation_controller_impl_unittest.cc - Issue 1800123002: PlzNavigate: fix several failing NavigationControllerTests

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

Issue 1800123002: PlzNavigate: fix several failing NavigationControllerTests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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_unittests.filter » ('j') | testing/buildbot/filters/browser-side-navigation.linux.content_unittests.filter » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_controller_impl_unittest.cc

diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc

index 3692b4b08284ede88f56f33bcbd833465065c958..45b7e420d91a6bd152a6e369db3c8ee20c27377f 100644

--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc

+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc

@@ -2113,6 +2113,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {

contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());

const GURL subframe_url("http://foo1/subframe");

{

+ subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 1;

params.nav_entry_id = 0;

@@ -2132,6 +2133,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {

// Now do a new navigation in the frame.

const GURL url2("http://foo2");

+ subframe->SendRendererInitiatedNavigationRequest(url2, true);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 2;

params.nav_entry_id = 0;

@@ -2195,6 +2197,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {

contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());

const GURL url2("http://foo/2");

{

+ subframe->SendRendererInitiatedNavigationRequest(url2, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 1;

params.nav_entry_id = 0;

@@ -2241,6 +2244,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {

contents()->GetFrameTree()->root()->child_at(1)->current_frame_host());

const GURL url3("http://foo/3");

{

+ subframe2->SendRendererInitiatedNavigationRequest(url3, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 1;

params.nav_entry_id = 0;

@@ -2292,6 +2296,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {

->current_frame_host());

const GURL url4("http://foo/4");

{

+ subframe3->SendRendererInitiatedNavigationRequest(url4, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 1;

params.nav_entry_id = 0;

@@ -2353,6 +2358,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {

contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());

const GURL subframe_url("http://foo1/subframe");

{

+ subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 1;

params.nav_entry_id = 0;

@@ -2384,6 +2390,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {

params.page_state = PageState::CreateFromURL(url2);

// This should generate a new entry.

+ subframe->SendRendererInitiatedNavigationRequest(url2, false);

Charlie Reis 2016/03/16 17:08:41 Why are some of these before the params declaratio

clamy 2016/03/17 13:27:17 Done.

subframe->PrepareForCommit();

subframe->SendNavigateWithParams(&params);

NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();

@@ -2409,6 +2416,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {

params.url = url3;

params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;

params.page_state = PageState::CreateFromURL(url3);

+ subframe->SendRendererInitiatedNavigationRequest(url3, false);

subframe->PrepareForCommit();

subframe->SendNavigateWithParams(&params);

EXPECT_EQ(1U, navigation_entry_committed_counter_);

@@ -2503,6 +2511,7 @@ TEST_F(NavigationControllerTest, InPage) {

// Ensure main page navigation to same url respects the was_within_same_page

// hint provided in the params.

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url1, false);

FrameHostMsg_DidCommitProvisionalLoad_Params self_params;

self_params.page_id = 0;

self_params.nav_entry_id = 0;

@@ -2527,6 +2536,7 @@ TEST_F(NavigationControllerTest, InPage) {

// Fragment navigation to a new page_id.

const GURL url2("http://foo#a");

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 1;

params.nav_entry_id = 0;

@@ -2597,6 +2607,7 @@ TEST_F(NavigationControllerTest, InPage) {

// Finally, navigate to an unrelated URL to make sure in_page is not sticky.

const GURL url3("http://bar");

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url3, false);

params.page_id = 2;

params.nav_entry_id = 0;

params.did_create_new_entry = true;

@@ -2624,6 +2635,7 @@ TEST_F(NavigationControllerTest, InPage_Replace) {

// First navigation.

const GURL url2("http://foo#a");

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 0; // Same page_id

params.nav_entry_id = 0;

@@ -2677,6 +2689,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) {

// Navigate within the page.

{

const GURL url("http://foo2/#a");

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 1; // Same page_id

params.nav_entry_id = 0;

@@ -2704,6 +2717,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) {

// Perform a client redirect to a new page.

{

const GURL url("http://foo3/");

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 2; // New page_id

params.nav_entry_id = 0;

@@ -3796,6 +3810,7 @@ TEST_F(NavigationControllerTest, SameSubframe) {

TestRenderFrameHost* subframe = static_cast<TestRenderFrameHost*>(

contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());

const GURL subframe_url("http://www.google.com/#");

+ subframe->SendRendererInitiatedNavigationRequest(subframe_url, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = 0;

params.nav_entry_id = 0;

@@ -3963,6 +3978,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) {

TestRenderFrameHost* subframe = static_cast<TestRenderFrameHost*>(

contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());

const GURL url1_sub("http://foo/subframe");

+ subframe->SendRendererInitiatedNavigationRequest(url1_sub, false);

FrameHostMsg_DidCommitProvisionalLoad_Params params;

params.page_id = controller.GetLastCommittedEntry()->GetPageID();

params.nav_entry_id = 0;

@@ -5053,6 +5069,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) {

// Navigate to new page.

{

LoadCommittedDetailsObserver observer(contents());

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);

main_test_rfh()->PrepareForCommit();

main_test_rfh()->SendNavigateWithParams(&params);

EXPECT_EQ(PAGE_TYPE_ERROR,

@@ -5064,6 +5081,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) {

{

params.did_create_new_entry = false;

LoadCommittedDetailsObserver observer(contents());

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(url, false);

main_test_rfh()->PrepareForCommit();

main_test_rfh()->SendNavigateWithParams(&params);

EXPECT_EQ(PAGE_TYPE_ERROR,

@@ -5093,6 +5111,7 @@ TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) {

params.was_within_same_page = true;

{

LoadCommittedDetailsObserver observer(contents());

+ main_test_rfh()->SendRendererInitiatedNavigationRequest(params.url, false);

main_test_rfh()->PrepareForCommit();

main_test_rfh()->SendNavigateWithParams(&params);

EXPECT_EQ(PAGE_TYPE_ERROR,