Remove TabContentsType from the NavigationController external interface and in

some related areas. I removed all uses of this in the previous patch.
Review URL: http://codereview.chromium.org/73057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13730 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index e87b44b..0c1e95e 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -85,7 +85,7 @@ SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(
       unsafe_resources_(unsafe_resources) {
   if (!is_main_frame_) {
     navigation_entry_index_to_remove_ =
-        tab()->controller()->GetLastCommittedEntryIndex();
+        tab()->controller()->last_committed_entry_index();
   } else {
     navigation_entry_index_to_remove_ = -1;
   }
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
index 45ff6f7..e8311db 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -169,7 +169,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageDontProceed) {
   EXPECT_FALSE(GetSafeBrowsingBlockingPage());
 
   // We did not proceed, the pending entry should be gone.
-  EXPECT_FALSE(controller()->GetPendingEntry());
+  EXPECT_FALSE(controller()->pending_entry());
 }
 
 // Tests showing a blocking page for a malware page and then proceeding.
@@ -215,7 +215,7 @@ TEST_F(SafeBrowsingBlockingPageTest, PageWithMalwareResourceDontProceed) {
 
   // We did not proceed, we should be back to the first page, the 2nd one should
   // have been removed from the navigation controller.
-  ASSERT_EQ(1, controller()->GetEntryCount());
+  ASSERT_EQ(1, controller()->entry_count());
   EXPECT_EQ(kGoogleURL, controller()->GetActiveEntry()->url().spec());
 }
 
@@ -237,7 +237,7 @@ TEST_F(SafeBrowsingBlockingPageTest, PageWithMalwareResourceProceed) {
   EXPECT_FALSE(GetSafeBrowsingBlockingPage());
 
   // We did proceed, we should be back to showing the page.
-  ASSERT_EQ(1, controller()->GetEntryCount());
+  ASSERT_EQ(1, controller()->entry_count());
   EXPECT_EQ(kGoodURL, controller()->GetActiveEntry()->url().spec());
 }
 
@@ -270,7 +270,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
 
   // We did not proceed, we should be back to the first page, the 2nd one should
   // have been removed from the navigation controller.
-  ASSERT_EQ(1, controller()->GetEntryCount());
+  ASSERT_EQ(1, controller()->entry_count());
   EXPECT_EQ(kGoogleURL, controller()->GetActiveEntry()->url().spec());
 }
 
@@ -313,7 +313,7 @@ TEST_F(SafeBrowsingBlockingPageTest,
 
   // We did not proceed, we should be back to the first page, the 2nd one should
   // have been removed from the navigation controller.
-  ASSERT_EQ(1, controller()->GetEntryCount());
+  ASSERT_EQ(1, controller()->entry_count());
   EXPECT_EQ(kGoogleURL, controller()->GetActiveEntry()->url().spec());
 }
 
@@ -350,6 +350,6 @@ TEST_F(SafeBrowsingBlockingPageTest, PageWithMultipleMalwareResourceProceed) {
   EXPECT_EQ(OK, user_response());
 
   // We did proceed, we should be back to the initial page.
-  ASSERT_EQ(1, controller()->GetEntryCount());
+  ASSERT_EQ(1, controller()->entry_count());
   EXPECT_EQ(kGoodURL, controller()->GetActiveEntry()->url().spec());
 }