Remove the remaining usages of NavigationEntry in chrome by converting a few more NavigationController methods to return the interface. In a followup, I'll rename NavigationEntry to NavigationEntryImpl, then create an interface for NavigationController.

BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9004045

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

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index 9c1d066..f6e9646 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -28,8 +28,8 @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/navigation_controller.h"
-#include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/navigation_entry.h"
 
 using base::Time;
 
@@ -492,7 +492,7 @@ void TabRestoreService::PopulateTab(Tab* tab,
   tab->navigations.resize(static_cast<int>(entry_count));
   for (int i = 0; i < entry_count; ++i) {
     content::NavigationEntry* entry = (i == pending_index) ?
-        controller->pending_entry() : controller->GetEntryAtIndex(i);
+        controller->GetPendingEntry() : controller->GetEntryAtIndex(i);
     tab->navigations[i].SetFromNavigationEntry(*entry);
   }
   tab->timestamp = TimeNow();
@@ -657,7 +657,7 @@ void TabRestoreService::ScheduleCommandsForTab(const Tab& tab,
       // Creating a NavigationEntry isn't the most efficient way to go about
       // this, but it simplifies the code and makes it less error prone as we
       // add new data to NavigationEntry.
-      scoped_ptr<NavigationEntry> entry(
+      scoped_ptr<content::NavigationEntry> entry(
           navigations[i].ToNavigationEntry(wrote_count, profile()));
       ScheduleCommand(
           CreateUpdateTabNavigationCommand(kCommandUpdateTabNavigation, tab.id,