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

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

Issue 2368183004: Move redirect_chain from NavigationEntry to FrameNavigationEntry. (Closed)
Patch Set: 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 c169123c497a5ec9fb4e1a2e912787716855e799..53585c0fc3a4af768165520d2d476349666cc671 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -1634,17 +1634,17 @@ TEST_F(NavigationControllerTest, RedirectsAreNotResetByCommit) {
// Set redirects on the pending entry.
NavigationEntryImpl* pending_entry = controller.GetPendingEntry();
- pending_entry->SetRedirectChain(redirects);
- EXPECT_EQ(1U, pending_entry->GetRedirectChain().size());
- EXPECT_EQ(url2, pending_entry->GetRedirectChain()[0]);
+ pending_entry->SetMainFrameRedirectChain(redirects);
+ EXPECT_EQ(1U, pending_entry->GetMainFrameRedirectChain().size());
+ EXPECT_EQ(url2, pending_entry->GetMainFrameRedirectChain()[0]);
// Normal navigation will preserve redirects in the committed entry.
main_test_rfh()->PrepareForCommitWithServerRedirect(url2);
main_test_rfh()->SendNavigateWithModificationCallback(0, entry_id, true, url1,
set_redirects_callback);
NavigationEntryImpl* committed_entry = controller.GetLastCommittedEntry();
- ASSERT_EQ(1U, committed_entry->GetRedirectChain().size());
- EXPECT_EQ(url2, committed_entry->GetRedirectChain()[0]);
+ ASSERT_EQ(1U, committed_entry->GetMainFrameRedirectChain().size());
+ EXPECT_EQ(url2, committed_entry->GetMainFrameRedirectChain()[0]);
}
// Tests what happens when we navigate back successfully

Powered by Google App Engine
This is Rietveld 408576698