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

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

Issue 1422333009: OOPIF: History navigations for new child frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improve comment. Created 5 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
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 44b1acb9a69b2ff32322180830c98ada35b0ea05..35d8319af9c3ce88a3daa0b5f9e2369e90b181e5 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -2322,6 +2322,7 @@ 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);
EXPECT_TRUE(controller.RendererDidNavigate(subframe, params, &details));
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -2346,6 +2347,7 @@ 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);
EXPECT_TRUE(controller.RendererDidNavigate(subframe, params, &details));
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -2360,8 +2362,9 @@ TEST_F(NavigationControllerTest, BackSubframe) {
params.page_id = 1;
params.nav_entry_id = entry1->GetUniqueID();
params.did_create_new_entry = false;
- params.url = url1;
+ params.url = subframe_url;
params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
+ params.page_state = PageState::CreateFromURL(subframe_url);
EXPECT_TRUE(controller.RendererDidNavigate(subframe, params, &details));
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;

Powered by Google App Engine
This is Rietveld 408576698