Index: content/browser/web_contents/web_contents_impl_unittest.cc |
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc |
index aded7ae002fe4e2db15d7c3e77498d79b0db2460..2b54a5a78124f6ef245d0f17894b00c79fbc89ce 100644 |
--- a/content/browser/web_contents/web_contents_impl_unittest.cc |
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc |
@@ -376,7 +376,7 @@ TEST_F(WebContentsImplTest, SimpleNavigation) { |
// Controller's pending entry will have a NULL site instance until we assign |
// it in DidNavigate. |
EXPECT_TRUE( |
- NavigationEntryImpl::FromNavigationEntry(controller().GetActiveEntry())-> |
+ NavigationEntryImpl::FromNavigationEntry(controller().GetVisibleEntry())-> |
site_instance() == NULL); |
// DidNavigate from the page |
@@ -388,7 +388,7 @@ TEST_F(WebContentsImplTest, SimpleNavigation) { |
// able to find it later. |
EXPECT_EQ( |
instance1, |
- NavigationEntryImpl::FromNavigationEntry(controller().GetActiveEntry())-> |
+ NavigationEntryImpl::FromNavigationEntry(controller().GetVisibleEntry())-> |
site_instance()); |
} |
@@ -400,7 +400,7 @@ TEST_F(WebContentsImplTest, NavigateToExcessivelyLongURL) { |
controller().LoadURL( |
url, Referrer(), PAGE_TRANSITION_GENERATED, std::string()); |
- EXPECT_TRUE(controller().GetActiveEntry() == NULL); |
+ EXPECT_TRUE(controller().GetVisibleEntry() == NULL); |
} |
// Test that navigating across a site boundary creates a new RenderViewHost |
@@ -1233,7 +1233,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_TRUE(interstitial->is_showing()); |
EXPECT_TRUE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == interstitial); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url2); |
@@ -1242,7 +1242,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_EQ(TestInterstitialPage::CANCELED, state); |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- entry = controller().GetActiveEntry(); |
+ entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url1); |
EXPECT_EQ(1, controller().GetEntryCount()); |
@@ -1280,7 +1280,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_TRUE(interstitial->is_showing()); |
EXPECT_TRUE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == interstitial); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url2); |
@@ -1289,7 +1289,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_EQ(TestInterstitialPage::CANCELED, state); |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- entry = controller().GetActiveEntry(); |
+ entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url1); |
EXPECT_EQ(1, controller().GetEntryCount()); |
@@ -1325,7 +1325,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialNoNewNavigationDontProceed) { |
EXPECT_TRUE(interstitial->is_showing()); |
EXPECT_TRUE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == interstitial); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
// The URL specified to the interstitial should have been ignored. |
EXPECT_TRUE(entry->GetURL() == url1); |
@@ -1335,7 +1335,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialNoNewNavigationDontProceed) { |
EXPECT_EQ(TestInterstitialPage::CANCELED, state); |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- entry = controller().GetActiveEntry(); |
+ entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url1); |
EXPECT_EQ(1, controller().GetEntryCount()); |
@@ -1376,7 +1376,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_TRUE(interstitial->is_showing()); |
EXPECT_TRUE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == interstitial); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url2); |
@@ -1396,7 +1396,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- entry = controller().GetActiveEntry(); |
+ entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url3); |
@@ -1434,7 +1434,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_TRUE(interstitial->is_showing()); |
EXPECT_TRUE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == interstitial); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url2); |
@@ -1454,7 +1454,7 @@ TEST_F(WebContentsImplTest, |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- entry = controller().GetActiveEntry(); |
+ entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url3); |
@@ -1491,7 +1491,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialNoNewNavigationProceed) { |
EXPECT_TRUE(interstitial->is_showing()); |
EXPECT_TRUE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == interstitial); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
// The URL specified to the interstitial should have been ignored. |
EXPECT_TRUE(entry->GetURL() == url1); |
@@ -1503,7 +1503,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialNoNewNavigationProceed) { |
EXPECT_EQ(TestInterstitialPage::OKED, state); |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- entry = controller().GetActiveEntry(); |
+ entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == url1); |
@@ -1562,7 +1562,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialThenGoBack) { |
// Make sure we are back to the original page and that the interstitial is |
// gone. |
EXPECT_EQ(TestInterstitialPage::CANCELED, state); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry); |
EXPECT_EQ(url1.spec(), entry->GetURL().spec()); |
@@ -1602,7 +1602,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialCrashRendererThenGoBack) { |
// Make sure we are back to the original page and that the interstitial is |
// gone. |
EXPECT_EQ(TestInterstitialPage::CANCELED, state); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry); |
EXPECT_EQ(url1.spec(), entry->GetURL().spec()); |
@@ -1769,7 +1769,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialOnInterstitial) { |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == landing_url); |
EXPECT_EQ(2, controller().GetEntryCount()); |
@@ -1828,7 +1828,7 @@ TEST_F(WebContentsImplTest, ShowInterstitialProceedShowInterstitial) { |
EXPECT_TRUE(deleted2); |
EXPECT_FALSE(contents()->ShowingInterstitialPage()); |
EXPECT_TRUE(contents()->GetInterstitialPage() == NULL); |
- NavigationEntry* entry = controller().GetActiveEntry(); |
+ NavigationEntry* entry = controller().GetVisibleEntry(); |
ASSERT_TRUE(entry != NULL); |
EXPECT_TRUE(entry->GetURL() == landing_url); |
EXPECT_EQ(2, controller().GetEntryCount()); |