Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/sessions/persistent_tab_restore_service.cc

Index: chrome/browser/sessions/persistent_tab_restore_service.cc
diff --git a/chrome/browser/sessions/persistent_tab_restore_service.cc b/chrome/browser/sessions/persistent_tab_restore_service.cc
index 00fcfc4ee7f217f50e78981a8cd4766e67e14a78..bab7f554d6fac9de8039c9c307333b35aba74ec4 100644
--- a/chrome/browser/sessions/persistent_tab_restore_service.cc
+++ b/chrome/browser/sessions/persistent_tab_restore_service.cc
@@ -23,6 +23,8 @@
 #include "components/sessions/core/session_constants.h"
 #include "components/sessions/session_command.h"
 
+using sessions::LiveTab;
+
 namespace {
 
 // Only written if the tab is pinned.
@@ -945,10 +947,9 @@ void PersistentTabRestoreService::RemoveObserver(
   helper_.RemoveObserver(observer);
 }
 
-void PersistentTabRestoreService::CreateHistoricalTab(
-    content::WebContents* contents,
-    int index) {
-  helper_.CreateHistoricalTab(contents, index);
+void PersistentTabRestoreService::CreateHistoricalTab(LiveTab* live_tab,
+                                                      int index) {
+  helper_.CreateHistoricalTab(live_tab, index);
 }
 
 void PersistentTabRestoreService::BrowserClosing(
@@ -969,8 +970,7 @@ const TabRestoreService::Entries& PersistentTabRestoreService::entries() const {
   return helper_.entries();
 }
 
-std::vector<content::WebContents*>
-PersistentTabRestoreService::RestoreMostRecentEntry(
+std::vector<LiveTab*> PersistentTabRestoreService::RestoreMostRecentEntry(
     TabRestoreServiceDelegate* delegate,
     int host_desktop_type) {
   return helper_.RestoreMostRecentEntry(delegate, host_desktop_type);
@@ -981,8 +981,7 @@ TabRestoreService::Tab* PersistentTabRestoreService::RemoveTabEntryById(
   return helper_.RemoveTabEntryById(id);
 }
 
-std::vector<content::WebContents*>
-PersistentTabRestoreService::RestoreEntryById(
+std::vector<LiveTab*> PersistentTabRestoreService::RestoreEntryById(
     TabRestoreServiceDelegate* delegate,
     SessionID::id_type id,
     int host_desktop_type,