content/browser/frame_host/navigation_controller_impl_unittest.cc - Issue 2309583002: Fix for the NavigationControllerTest.BackSubframe test failures with PlzNavigate

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

Issue 2309583002: Fix for the NavigationControllerTest.BackSubframe test failures with PlzNavigate (Closed)

Patch Set: Add the item sequence number and document sequence number to the page state Created 4 years, 3 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

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 b01157bf13be2272044ab388e6344253a3bf35f3..7d8663d80e215e225e10f572eae30e7887b48ebe 100644

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

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

@@ -2472,7 +2472,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.method = "GET";

- params.page_state = PageState::CreateFromURL(subframe_url);

+ params.page_state = TestRenderFrameHost::CreatePageStateForURL(

+ subframe_url, item_sequence_number1, 0);

params.item_sequence_number = item_sequence_number1;

// Navigating should do nothing.

@@ -2501,7 +2502,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.method = "GET";

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

+ params.page_state = TestRenderFrameHost::CreatePageStateForURL(

+ url2, item_sequence_number2, 0);

nasko 2016/09/07 23:21:59 The document sequence number should be different t

ananta 2016/09/07 23:58:44 Done.

params.item_sequence_number = item_sequence_number2;

// This should generate a new entry.

@@ -2532,8 +2534,9 @@ TEST_F(NavigationControllerTest, BackSubframe) {

params.did_create_new_entry = true;

params.url = url3;

params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;

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

params.item_sequence_number = base::Time::Now().ToDoubleT() * 1000000;

+ params.page_state = TestRenderFrameHost::CreatePageStateForURL(

+ url3, params.item_sequence_number, 0);

nasko 2016/09/07 23:21:59 Same here. Document number cannot be the same.

ananta 2016/09/07 23:58:44 Done.

subframe->SendRendererInitiatedNavigationRequest(url3, false);

subframe->PrepareForCommit();

subframe->SendNavigateWithParams(&params);

@@ -2561,7 +2564,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {

params.did_create_new_entry = false;

params.url = url2;

params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;

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

+ params.page_state = TestRenderFrameHost::CreatePageStateForURL(

+ url2, item_sequence_number2, 0);

params.item_sequence_number = item_sequence_number2;

subframe->PrepareForCommit();

subframe->SendNavigateWithParams(&params);

@@ -2581,7 +2585,8 @@ TEST_F(NavigationControllerTest, BackSubframe) {

params.did_create_new_entry = false;

params.url = subframe_url;

params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;

- params.page_state = PageState::CreateFromURL(subframe_url);

+ params.page_state = TestRenderFrameHost::CreatePageStateForURL(

+ subframe_url, item_sequence_number1, 0);

params.item_sequence_number = item_sequence_number1;

subframe->PrepareForCommit();

subframe->SendNavigateWithParams(&params);

« no previous file with comments | « no previous file | content/test/test_render_frame_host.h » ('j') | content/test/test_render_frame_host.cc » ('J')