Chromium Code Reviews Chromium Code Reviews
Issue 23022006:
Remove GetActiveEntry usage from content. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: content/browser/web_contents/navigation_controller_impl_unittest.cc |
| diff --git a/content/browser/web_contents/navigation_controller_impl_unittest.cc b/content/browser/web_contents/navigation_controller_impl_unittest.cc |
| index 7a0b03b2bf06d7f09b1feb1144aae0701201b645..44f2924aac33cc1befccff94c61cb52d5646118a 100644 |
| --- a/content/browser/web_contents/navigation_controller_impl_unittest.cc |
| +++ b/content/browser/web_contents/navigation_controller_impl_unittest.cc |
| @@ -253,7 +253,7 @@ TEST_F(NavigationControllerTest, Defaults) { |
| NavigationControllerImpl& controller = controller_impl(); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - EXPECT_FALSE(controller.GetActiveEntry()); |
| + EXPECT_FALSE(controller.GetVisibleEntry()); |
|
Charlie Reis
2013/08/16 22:10:14
Redundant with next line.
nasko
2013/09/12 17:56:31
Done.
|
| EXPECT_FALSE(controller.GetVisibleEntry()); |
| EXPECT_FALSE(controller.GetLastCommittedEntry()); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| @@ -277,7 +277,7 @@ TEST_F(NavigationControllerTest, GoToOffset) { |
| test_rvh()->SendNavigate(0, urls[0]); |
| EXPECT_EQ(1U, navigation_entry_committed_counter_); |
| navigation_entry_committed_counter_ = 0; |
| - EXPECT_EQ(urls[0], controller.GetActiveEntry()->GetVirtualURL()); |
| + EXPECT_EQ(urls[0], controller.GetVisibleEntry()->GetVirtualURL()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| EXPECT_FALSE(controller.CanGoToOffset(1)); |
| @@ -286,7 +286,7 @@ TEST_F(NavigationControllerTest, GoToOffset) { |
| test_rvh()->SendNavigate(i, urls[i]); |
| EXPECT_EQ(1U, navigation_entry_committed_counter_); |
| navigation_entry_committed_counter_ = 0; |
| - EXPECT_EQ(urls[i], controller.GetActiveEntry()->GetVirtualURL()); |
| + EXPECT_EQ(urls[i], controller.GetVisibleEntry()->GetVirtualURL()); |
| EXPECT_TRUE(controller.CanGoToOffset(-i)); |
| EXPECT_FALSE(controller.CanGoToOffset(-(i + 1))); |
| EXPECT_FALSE(controller.CanGoToOffset(1)); |
| @@ -349,7 +349,7 @@ TEST_F(NavigationControllerTest, LoadURL) { |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_FALSE(controller.GetLastCommittedEntry()); |
| ASSERT_TRUE(controller.GetPendingEntry()); |
| - EXPECT_EQ(controller.GetPendingEntry(), controller.GetActiveEntry()); |
| + EXPECT_EQ(controller.GetPendingEntry(), controller.GetVisibleEntry()); |
|
Charlie Reis
2013/08/16 22:10:14
Redundant with next line.
nasko
2013/09/12 17:56:31
Done.
|
| EXPECT_EQ(controller.GetPendingEntry(), controller.GetVisibleEntry()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| @@ -371,8 +371,8 @@ TEST_F(NavigationControllerTest, LoadURL) { |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| - EXPECT_EQ(controller.GetActiveEntry(), controller.GetVisibleEntry()); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| + EXPECT_EQ(controller.GetVisibleEntry(), controller.GetVisibleEntry()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| EXPECT_EQ(contents()->GetMaxPageID(), 0); |
| @@ -380,7 +380,7 @@ TEST_F(NavigationControllerTest, LoadURL) { |
| controller.GetLastCommittedEntry())->bindings()); |
| // The timestamp should have been set. |
| - EXPECT_FALSE(controller.GetActiveEntry()->GetTimestamp().is_null()); |
| + EXPECT_FALSE(controller.GetVisibleEntry()->GetTimestamp().is_null()); |
| // Load another... |
| controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); |
| @@ -391,7 +391,7 @@ TEST_F(NavigationControllerTest, LoadURL) { |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| ASSERT_TRUE(controller.GetPendingEntry()); |
| - EXPECT_EQ(controller.GetPendingEntry(), controller.GetActiveEntry()); |
| + EXPECT_EQ(controller.GetPendingEntry(), controller.GetVisibleEntry()); |
|
Charlie Reis
2013/08/16 22:10:14
Redundant.
nasko
2013/09/12 17:56:31
Done.
|
| EXPECT_EQ(controller.GetPendingEntry(), controller.GetVisibleEntry()); |
| // TODO(darin): maybe this should really be true? |
| EXPECT_FALSE(controller.CanGoBack()); |
| @@ -414,13 +414,13 @@ TEST_F(NavigationControllerTest, LoadURL) { |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| - EXPECT_EQ(controller.GetActiveEntry(), controller.GetVisibleEntry()); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| + EXPECT_EQ(controller.GetVisibleEntry(), controller.GetVisibleEntry()); |
| EXPECT_TRUE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| EXPECT_EQ(contents()->GetMaxPageID(), 1); |
| - EXPECT_FALSE(controller.GetActiveEntry()->GetTimestamp().is_null()); |
| + EXPECT_FALSE(controller.GetVisibleEntry()->GetTimestamp().is_null()); |
| } |
| namespace { |
| @@ -582,8 +582,8 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage) { |
| EXPECT_EQ(1U, navigation_entry_committed_counter_); |
| navigation_entry_committed_counter_ = 0; |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| - const base::Time timestamp = controller.GetActiveEntry()->GetTimestamp(); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| + const base::Time timestamp = controller.GetVisibleEntry()->GetTimestamp(); |
| EXPECT_FALSE(timestamp.is_null()); |
| controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); |
| @@ -598,7 +598,7 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage) { |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| @@ -606,7 +606,7 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage) { |
| // |
| // TODO(akalin): Change this EXPECT_GE (and other similar ones) to |
| // EXPECT_GT once we guarantee that timestamps are unique. |
| - EXPECT_GE(controller.GetActiveEntry()->GetTimestamp(), timestamp); |
| + EXPECT_GE(controller.GetVisibleEntry()->GetTimestamp(), timestamp); |
| } |
| // Tests loading a URL but discarding it before the load commits. |
| @@ -624,8 +624,8 @@ TEST_F(NavigationControllerTest, LoadURL_Discarded) { |
| EXPECT_EQ(1U, navigation_entry_committed_counter_); |
| navigation_entry_committed_counter_ = 0; |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| - const base::Time timestamp = controller.GetActiveEntry()->GetTimestamp(); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| + const base::Time timestamp = controller.GetVisibleEntry()->GetTimestamp(); |
| EXPECT_FALSE(timestamp.is_null()); |
| controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string()); |
| @@ -638,12 +638,12 @@ TEST_F(NavigationControllerTest, LoadURL_Discarded) { |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| // Timestamp should not have changed. |
| - EXPECT_EQ(timestamp, controller.GetActiveEntry()->GetTimestamp()); |
| + EXPECT_EQ(timestamp, controller.GetVisibleEntry()->GetTimestamp()); |
| } |
| // Tests navigations that come in unrequested. This happens when the user |
| @@ -671,7 +671,7 @@ TEST_F(NavigationControllerTest, LoadURL_NoPending) { |
| navigation_entry_committed_counter_ = 0; |
| EXPECT_EQ(-1, controller.GetPendingEntryIndex()); |
| EXPECT_EQ(1, controller.GetLastCommittedEntryIndex()); |
| - EXPECT_EQ(kNewURL, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(kNewURL, controller.GetVisibleEntry()->GetURL()); |
| } |
| // Tests navigating to a new URL when there is a new pending navigation that is |
| @@ -709,7 +709,7 @@ TEST_F(NavigationControllerTest, LoadURL_NewPending) { |
| navigation_entry_committed_counter_ = 0; |
| EXPECT_EQ(-1, controller.GetPendingEntryIndex()); |
| EXPECT_EQ(1, controller.GetLastCommittedEntryIndex()); |
| - EXPECT_EQ(kNewURL, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(kNewURL, controller.GetVisibleEntry()->GetURL()); |
| } |
| // Tests navigating to a new URL when there is a pending back/forward |
| @@ -753,7 +753,7 @@ TEST_F(NavigationControllerTest, LoadURL_ExistingPending) { |
| navigation_entry_committed_counter_ = 0; |
| EXPECT_EQ(-1, controller.GetPendingEntryIndex()); |
| EXPECT_EQ(2, controller.GetLastCommittedEntryIndex()); |
| - EXPECT_EQ(kNewURL, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(kNewURL, controller.GetVisibleEntry()->GetURL()); |
| } |
| // Tests navigating to a new URL when there is a pending back/forward |
| @@ -806,7 +806,7 @@ TEST_F(NavigationControllerTest, LoadURL_PrivilegedPending) { |
| navigation_entry_committed_counter_ = 0; |
| EXPECT_EQ(-1, controller.GetPendingEntryIndex()); |
| EXPECT_EQ(2, controller.GetLastCommittedEntryIndex()); |
| - EXPECT_EQ(kNewURL, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(kNewURL, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_EQ(0, NavigationEntryImpl::FromNavigationEntry( |
| controller.GetLastCommittedEntry())->bindings()); |
| } |
| @@ -851,7 +851,7 @@ TEST_F(NavigationControllerTest, LoadURL_BackPreemptsPending) { |
| navigation_entry_committed_counter_ = 0; |
| EXPECT_EQ(-1, controller.GetPendingEntryIndex()); |
| EXPECT_EQ(0, controller.GetLastCommittedEntryIndex()); |
| - EXPECT_EQ(kExistingURL1, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(kExistingURL1, controller.GetVisibleEntry()->GetURL()); |
| } |
| // Tests an ignored navigation when there is a pending new navigation. |
| @@ -1089,12 +1089,12 @@ TEST_F(NavigationControllerTest, Reload) { |
| test_rvh()->SendNavigate(0, url1); |
| EXPECT_EQ(1U, navigation_entry_committed_counter_); |
| navigation_entry_committed_counter_ = 0; |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| - controller.GetActiveEntry()->SetTitle(ASCIIToUTF16("Title")); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| + controller.GetVisibleEntry()->SetTitle(ASCIIToUTF16("Title")); |
| controller.Reload(true); |
| EXPECT_EQ(0U, notifications.size()); |
| - const base::Time timestamp = controller.GetActiveEntry()->GetTimestamp(); |
| + const base::Time timestamp = controller.GetVisibleEntry()->GetTimestamp(); |
| EXPECT_FALSE(timestamp.is_null()); |
| // The reload is pending. |
| @@ -1108,7 +1108,7 @@ TEST_F(NavigationControllerTest, Reload) { |
| // Make sure the title has been cleared (will be redrawn just after reload). |
| // Avoids a stale cached title when the new page being reloaded has no title. |
| // See http://crbug.com/96041. |
| - EXPECT_TRUE(controller.GetActiveEntry()->GetTitle().empty()); |
| + EXPECT_TRUE(controller.GetVisibleEntry()->GetTitle().empty()); |
| test_rvh()->SendNavigate(0, url1); |
| EXPECT_EQ(1U, navigation_entry_committed_counter_); |
| @@ -1124,8 +1124,8 @@ TEST_F(NavigationControllerTest, Reload) { |
| EXPECT_FALSE(controller.CanGoForward()); |
| // The timestamp should have been updated. |
| - ASSERT_TRUE(controller.GetActiveEntry()); |
| - EXPECT_GE(controller.GetActiveEntry()->GetTimestamp(), timestamp); |
| + ASSERT_TRUE(controller.GetVisibleEntry()); |
| + EXPECT_GE(controller.GetVisibleEntry()->GetTimestamp(), timestamp); |
| } |
| // Tests what happens when a reload navigation produces a new page. |
| @@ -1198,11 +1198,12 @@ TEST_F(NavigationControllerTest, ReloadOriginalRequestURL) { |
| // The NavigationEntry should save both the original URL and the final |
| // redirected URL. |
| - EXPECT_EQ(original_url, controller.GetActiveEntry()->GetOriginalRequestURL()); |
| - EXPECT_EQ(final_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ( |
| + original_url, controller.GetVisibleEntry()->GetOriginalRequestURL()); |
| + EXPECT_EQ(final_url, controller.GetVisibleEntry()->GetURL()); |
| // Reload using the original URL. |
| - controller.GetActiveEntry()->SetTitle(ASCIIToUTF16("Title")); |
| + controller.GetVisibleEntry()->SetTitle(ASCIIToUTF16("Title")); |
| controller.ReloadOriginalRequestURL(false); |
| EXPECT_EQ(0U, notifications.size()); |
| @@ -1219,7 +1220,7 @@ TEST_F(NavigationControllerTest, ReloadOriginalRequestURL) { |
| // Make sure the title has been cleared (will be redrawn just after reload). |
| // Avoids a stale cached title when the new page being reloaded has no title. |
| // See http://crbug.com/96041. |
| - EXPECT_TRUE(controller.GetActiveEntry()->GetTitle().empty()); |
| + EXPECT_TRUE(controller.GetVisibleEntry()->GetTitle().empty()); |
| // Send that the navigation has proceeded; say it got redirected again. |
| test_rvh()->SendNavigate(0, final_url); |
| @@ -1560,7 +1561,7 @@ TEST_F(NavigationControllerTest, Redirect) { |
| EXPECT_TRUE(controller.GetPendingEntry()); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| - EXPECT_EQ(url1, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); |
| ViewHostMsg_FrameNavigate_Params params; |
| params.page_id = 0; |
| @@ -1586,7 +1587,7 @@ TEST_F(NavigationControllerTest, Redirect) { |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - EXPECT_EQ(url2, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url2, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| @@ -1605,7 +1606,7 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { |
| // First request as POST |
| controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string()); |
| - controller.GetActiveEntry()->SetHasPostData(true); |
| + controller.GetVisibleEntry()->SetHasPostData(true); |
| EXPECT_EQ(0U, notifications.size()); |
| test_rvh()->SendNavigate(0, url2); |
| @@ -1617,7 +1618,7 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { |
| EXPECT_TRUE(controller.GetPendingEntry()); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| - EXPECT_EQ(url1, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); |
| ViewHostMsg_FrameNavigate_Params params; |
| params.page_id = 0; |
| @@ -1643,8 +1644,8 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - EXPECT_EQ(url2, controller.GetActiveEntry()->GetURL()); |
| - EXPECT_FALSE(controller.GetActiveEntry()->GetHasPostData()); |
| + EXPECT_EQ(url2, controller.GetVisibleEntry()->GetURL()); |
| + EXPECT_FALSE(controller.GetVisibleEntry()->GetHasPostData()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| @@ -1664,7 +1665,7 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) { |
| EXPECT_TRUE(controller.GetPendingEntry()); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| - EXPECT_EQ(url1, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); |
| ViewHostMsg_FrameNavigate_Params params; |
| params.page_id = 0; |
| @@ -1690,7 +1691,7 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) { |
| EXPECT_TRUE(controller.GetLastCommittedEntry()); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| EXPECT_FALSE(controller.GetPendingEntry()); |
| - EXPECT_EQ(url2, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url2, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| @@ -1943,7 +1944,7 @@ TEST_F(NavigationControllerTest, InPage) { |
| EXPECT_TRUE(details.is_in_page); |
| EXPECT_EQ(2, controller.GetEntryCount()); |
| EXPECT_EQ(0, controller.GetCurrentEntryIndex()); |
| - EXPECT_EQ(back_params.url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(back_params.url, controller.GetVisibleEntry()->GetURL()); |
| // Go forward |
| ViewHostMsg_FrameNavigate_Params forward_params(params); |
| @@ -1957,7 +1958,7 @@ TEST_F(NavigationControllerTest, InPage) { |
| EXPECT_EQ(2, controller.GetEntryCount()); |
| EXPECT_EQ(1, controller.GetCurrentEntryIndex()); |
| EXPECT_EQ(forward_params.url, |
| - controller.GetActiveEntry()->GetURL()); |
| + controller.GetVisibleEntry()->GetURL()); |
| // Now go back and forward again. This is to work around a bug where we would |
| // compare the incoming URL with the last committed entry rather than the |
| @@ -1968,7 +1969,7 @@ TEST_F(NavigationControllerTest, InPage) { |
| controller.GoForward(); |
| EXPECT_TRUE(controller.RendererDidNavigate(forward_params, &details)); |
| EXPECT_EQ(forward_params.url, |
| - controller.GetActiveEntry()->GetURL()); |
| + controller.GetVisibleEntry()->GetURL()); |
| // Finally, navigate to an unrelated URL to make sure in_page is not sticky. |
| const GURL url3("http://bar"); |
| @@ -2095,7 +2096,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) { |
| test_rvh()->SendNavigate(1, url); |
| EXPECT_EQ(1U, navigation_entry_committed_counter_); |
| navigation_entry_committed_counter_ = 0; |
| - EXPECT_EQ(url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL()); |
| } |
| } |
| @@ -2462,7 +2463,7 @@ TEST_F(NavigationControllerTest, TransientEntry) { |
| EXPECT_EQ(0U, notifications.size()); |
| // Check our state. |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_EQ(controller.GetEntryCount(), 3); |
| EXPECT_EQ(controller.GetLastCommittedEntryIndex(), 1); |
| EXPECT_EQ(controller.GetPendingEntryIndex(), -1); |
| @@ -2478,17 +2479,17 @@ TEST_F(NavigationControllerTest, TransientEntry) { |
| test_rvh()->SendNavigate(2, url2); |
| // We should have navigated, transient entry should be gone. |
| - EXPECT_EQ(url2, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url2, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_EQ(controller.GetEntryCount(), 3); |
| // Add a transient again, then navigate with no pending entry this time. |
| transient_entry = new NavigationEntryImpl; |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| test_rvh()->SendNavigate(3, url3); |
| // Transient entry should be gone. |
| - EXPECT_EQ(url3, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url3, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_EQ(controller.GetEntryCount(), 4); |
| // Initiate a navigation, add a transient then commit navigation. |
| @@ -2497,21 +2498,21 @@ TEST_F(NavigationControllerTest, TransientEntry) { |
| transient_entry = new NavigationEntryImpl; |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| test_rvh()->SendNavigate(4, url4); |
| - EXPECT_EQ(url4, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url4, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_EQ(controller.GetEntryCount(), 5); |
| // Add a transient and go back. This should simply remove the transient. |
| transient_entry = new NavigationEntryImpl; |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_TRUE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| controller.GoBack(); |
| // Transient entry should be gone. |
| - EXPECT_EQ(url4, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url4, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_EQ(controller.GetEntryCount(), 5); |
| test_rvh()->SendNavigate(3, url3); |
| @@ -2519,10 +2520,11 @@ TEST_F(NavigationControllerTest, TransientEntry) { |
| transient_entry = new NavigationEntryImpl; |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| controller.GoToIndex(1); |
| // The navigation should have been initiated, transient entry should be gone. |
| - EXPECT_EQ(url1, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_FALSE(controller.GetTransientEntry()); |
| + EXPECT_EQ(url1, controller.GetPendingEntry()->GetURL()); |
| // Visible entry does not update for history navigations until commit. |
| EXPECT_EQ(url3, controller.GetVisibleEntry()->GetURL()); |
| test_rvh()->SendNavigate(1, url1); |
| @@ -2532,12 +2534,12 @@ TEST_F(NavigationControllerTest, TransientEntry) { |
| transient_entry = new NavigationEntryImpl; |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| controller.GoToIndex(3); |
| // The navigation should have been initiated, transient entry should be gone. |
| // Because of the transient entry that is removed, going to index 3 makes us |
| // land on url2 (which is visible after the commit). |
| - EXPECT_EQ(url2, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url2, controller.GetPendingEntry()->GetURL()); |
| EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); |
| test_rvh()->SendNavigate(2, url2); |
| EXPECT_EQ(url2, controller.GetVisibleEntry()->GetURL()); |
| @@ -2546,11 +2548,12 @@ TEST_F(NavigationControllerTest, TransientEntry) { |
| transient_entry = new NavigationEntryImpl; |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_TRUE(controller.CanGoForward()); |
| controller.GoForward(); |
| // We should have navigated, transient entry should be gone. |
| - EXPECT_EQ(url3, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_FALSE(controller.GetTransientEntry()); |
| + EXPECT_EQ(url3, controller.GetPendingEntry()->GetURL()); |
| EXPECT_EQ(url2, controller.GetVisibleEntry()->GetURL()); |
| test_rvh()->SendNavigate(3, url3); |
| EXPECT_EQ(url3, controller.GetVisibleEntry()->GetURL()); |
| @@ -2559,10 +2562,11 @@ TEST_F(NavigationControllerTest, TransientEntry) { |
| transient_entry = new NavigationEntryImpl; |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| test_rvh()->SendNavigate(3, url3_ref); |
| // Transient entry should be gone. |
| - EXPECT_EQ(url3_ref, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_FALSE(controller.GetTransientEntry()); |
| + EXPECT_EQ(url3_ref, controller.GetVisibleEntry()->GetURL()); |
| // Ensure the URLs are correct. |
| EXPECT_EQ(controller.GetEntryCount(), 5); |
| @@ -2592,7 +2596,7 @@ TEST_F(NavigationControllerTest, ReloadTransient) { |
| transient_entry->SetURL(transient_url); |
| controller.SetTransientEntry(transient_entry); |
| EXPECT_TRUE(controller.GetTransientEntry()); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| // The page is reloaded, which should remove the pending entry for |url1| and |
| // the transient entry for |transient_url|, and start a navigation to |
| @@ -2600,7 +2604,7 @@ TEST_F(NavigationControllerTest, ReloadTransient) { |
| controller.Reload(true); |
| EXPECT_FALSE(controller.GetTransientEntry()); |
| EXPECT_TRUE(controller.GetPendingEntry()); |
| - EXPECT_EQ(transient_url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(transient_url, controller.GetVisibleEntry()->GetURL()); |
| ASSERT_EQ(controller.GetEntryCount(), 1); |
| EXPECT_EQ(controller.GetEntryAtIndex(0)->GetURL(), url0); |
| @@ -2668,29 +2672,29 @@ TEST_F(NavigationControllerTest, DontShowRendererURLUntilCommit) { |
| const GURL url0("http://foo/0"); |
| const GURL url1("http://foo/1"); |
| - // For typed navigations (browser-initiated), both active and visible entries |
| + // For typed navigations (browser-initiated), both pending and visible entries |
| // should update before commit. |
| controller.LoadURL(url0, Referrer(), PAGE_TRANSITION_TYPED, std::string()); |
| - EXPECT_EQ(url0, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url0, controller.GetPendingEntry()->GetURL()); |
| EXPECT_EQ(url0, controller.GetVisibleEntry()->GetURL()); |
| test_rvh()->SendNavigate(0, url0); |
| - // For link clicks (renderer-initiated navigations), the active entry should |
| + // For link clicks (renderer-initiated navigations), the pending entry should |
| // update before commit but the visible should not. |
| NavigationController::LoadURLParams load_url_params(url1); |
| load_url_params.is_renderer_initiated = true; |
| controller.LoadURLWithParams(load_url_params); |
| - EXPECT_EQ(url1, controller.GetActiveEntry()->GetURL()); |
| EXPECT_EQ(url0, controller.GetVisibleEntry()->GetURL()); |
| + EXPECT_EQ(url1, controller.GetPendingEntry()->GetURL()); |
| EXPECT_TRUE( |
| NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())-> |
| is_renderer_initiated()); |
| - // After commit, both should be updated, and we should no longer treat the |
| - // entry as renderer-initiated. |
| + // After commit, both visible should be updated, there should be no pending |
| + // entry, and we should no longer treat the entry as renderer-initiated. |
| test_rvh()->SendNavigate(1, url1); |
| - EXPECT_EQ(url1, controller.GetActiveEntry()->GetURL()); |
| EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); |
| + EXPECT_FALSE(controller.GetPendingEntry()); |
| EXPECT_FALSE( |
| NavigationEntryImpl::FromNavigationEntry( |
| controller.GetLastCommittedEntry())->is_renderer_initiated()); |
| @@ -2716,8 +2720,8 @@ TEST_F(NavigationControllerTest, ShowRendererURLInNewTabUntilModified) { |
| load_url_params.transition_type = PAGE_TRANSITION_LINK; |
| load_url_params.is_renderer_initiated = true; |
| controller.LoadURLWithParams(load_url_params); |
| - EXPECT_EQ(url, controller.GetActiveEntry()->GetURL()); |
| EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL()); |
| + EXPECT_EQ(url, controller.GetPendingEntry()->GetURL()); |
| EXPECT_TRUE( |
| NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())-> |
| is_renderer_initiated()); |
| @@ -2733,7 +2737,7 @@ TEST_F(NavigationControllerTest, ShowRendererURLInNewTabUntilModified) { |
| ViewHostMsg_DidAccessInitialDocument(0)); |
| EXPECT_TRUE(test_rvh()->has_accessed_initial_document()); |
| EXPECT_FALSE(controller.GetVisibleEntry()); |
| - EXPECT_EQ(url, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url, controller.GetPendingEntry()->GetURL()); |
| notifications.Reset(); |
| } |
| @@ -2753,7 +2757,7 @@ TEST_F(NavigationControllerTest, DontShowRendererURLInNewTabAfterCommit) { |
| load_url_params.transition_type = PAGE_TRANSITION_LINK; |
| load_url_params.is_renderer_initiated = true; |
| controller.LoadURLWithParams(load_url_params); |
| - EXPECT_EQ(url1, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); |
|
Charlie Reis
2013/08/16 22:10:14
Redundant.
nasko
2013/09/12 17:56:31
Done.
|
| EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL()); |
| EXPECT_TRUE( |
| NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())-> |
| @@ -2855,7 +2859,7 @@ TEST_F(NavigationControllerTest, CloneAndGoBack) { |
| const string16 title(ASCIIToUTF16("Title")); |
| NavigateAndCommit(url1); |
| - controller.GetActiveEntry()->SetTitle(title); |
| + controller.GetVisibleEntry()->SetTitle(title); |
| NavigateAndCommit(url2); |
| scoped_ptr<WebContents> clone(controller.GetWebContents()->Clone()); |
| @@ -2880,7 +2884,7 @@ TEST_F(NavigationControllerTest, CloneAndReload) { |
| const string16 title(ASCIIToUTF16("Title")); |
| NavigateAndCommit(url1); |
| - controller.GetActiveEntry()->SetTitle(title); |
| + controller.GetVisibleEntry()->SetTitle(title); |
| NavigateAndCommit(url2); |
| scoped_ptr<WebContents> clone(controller.GetWebContents()->Clone()); |
| @@ -2946,7 +2950,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) { |
| EXPECT_EQ(url1, controller.GetLastCommittedEntry()->GetURL()); |
| // The active entry should be unchanged by the subframe load. |
| - EXPECT_EQ(url2, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url2, controller.GetVisibleEntry()->GetURL()); |
| } |
| // Test CopyStateFrom with 2 urls, the first selected and nothing in the target. |
| @@ -3776,7 +3780,7 @@ TEST_F(NavigationControllerTest, ClearHistoryList) { |
| EXPECT_EQ(-1, controller.GetPendingEntryIndex()); |
| EXPECT_FALSE(controller.CanGoBack()); |
| EXPECT_FALSE(controller.CanGoForward()); |
| - EXPECT_EQ(url4, controller.GetActiveEntry()->GetURL()); |
| + EXPECT_EQ(url4, controller.GetVisibleEntry()->GetURL()); |
| } |
| /* TODO(brettw) These test pass on my local machine but fail on the XP buildbot |
