Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/sessions/in_memory_tab_restore_service.cc

Index: chrome/browser/sessions/in_memory_tab_restore_service.cc
diff --git a/chrome/browser/sessions/in_memory_tab_restore_service.cc b/chrome/browser/sessions/in_memory_tab_restore_service.cc
index dd3b6eeb12aa07e129c0ec33ae7a82d53ecbfd58..fdd15cfe34d31fc5308525b8419167a3c0e9827c 100644
--- a/chrome/browser/sessions/in_memory_tab_restore_service.cc
+++ b/chrome/browser/sessions/in_memory_tab_restore_service.cc
@@ -8,6 +8,8 @@
 
 #include "base/compiler_specific.h"
 
+using sessions::OpenTab;
+
 InMemoryTabRestoreService::InMemoryTabRestoreService(
     scoped_ptr<sessions::TabRestoreServiceClient> client,
     TabRestoreService::TimeFactory* time_factory)
@@ -26,10 +28,9 @@ void InMemoryTabRestoreService::RemoveObserver(
   helper_.RemoveObserver(observer);
 }
 
-void InMemoryTabRestoreService::CreateHistoricalTab(
-    content::WebContents* contents,
-    int index) {
-  helper_.CreateHistoricalTab(contents, index);
+void InMemoryTabRestoreService::CreateHistoricalTab(OpenTab* open_tab,
+                                                    int index) {
+  helper_.CreateHistoricalTab(open_tab, index);
 }
 
 void InMemoryTabRestoreService::BrowserClosing(
@@ -50,8 +51,7 @@ const TabRestoreService::Entries& InMemoryTabRestoreService::entries() const {
   return helper_.entries();
 }
 
-std::vector<content::WebContents*>
-InMemoryTabRestoreService::RestoreMostRecentEntry(
+std::vector<OpenTab*> InMemoryTabRestoreService::RestoreMostRecentEntry(
     TabRestoreServiceDelegate* delegate,
     int host_desktop_type) {
   return helper_.RestoreMostRecentEntry(delegate, host_desktop_type);
@@ -62,7 +62,7 @@ TabRestoreService::Tab* InMemoryTabRestoreService::RemoveTabEntryById(
   return helper_.RemoveTabEntryById(id);
 }
 
-std::vector<content::WebContents*> InMemoryTabRestoreService::RestoreEntryById(
+std::vector<OpenTab*> InMemoryTabRestoreService::RestoreEntryById(
     TabRestoreServiceDelegate* delegate,
     SessionID::id_type id,
     int host_desktop_type,