Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/sessions/tab_restore_service_delegate.h

Index: chrome/browser/sessions/tab_restore_service_delegate.h
diff --git a/chrome/browser/sessions/tab_restore_service_delegate.h b/chrome/browser/sessions/tab_restore_service_delegate.h
index f9bd07e33ba8ecb2aa11892d00d76668004b69f9..9d46eacab0624b16344bd484b6b1022c8392d7f9 100644
--- a/chrome/browser/sessions/tab_restore_service_delegate.h
+++ b/chrome/browser/sessions/tab_restore_service_delegate.h
@@ -10,9 +10,8 @@
 
 #include "components/sessions/session_id.h"
 
-namespace content {
-class NavigationController;
-class WebContents;
+namespace sessions {
+class OpenTab;
 }
 
 namespace sessions {
@@ -40,15 +39,14 @@ class TabRestoreServiceDelegate {
   // see Browser::app_name()
   virtual std::string GetAppName() const = 0;
 
-  // see Browser methods with the same names
-  virtual content::WebContents* GetWebContentsAt(int index) const = 0;
-  virtual content::WebContents* GetActiveWebContents() const = 0;
+  virtual sessions::OpenTab* GetOpenTabAt(int index) const = 0;
+  virtual sessions::OpenTab* GetActiveOpenTab() const = 0;
   virtual bool IsTabPinned(int index) const = 0;
 
   // Note: |tab_client_data| may be null (e.g., if |from_last_session| is true,
   // as the tab client data is not persisted, or if the embedder did not supply
   // client data for the tab in question).
-  virtual content::WebContents* AddRestoredTab(
+  virtual sessions::OpenTab* AddRestoredTab(
       const std::vector<sessions::SerializedNavigationEntry>& navigations,
       int tab_index,
       int selected_navigation,
@@ -61,7 +59,7 @@ class TabRestoreServiceDelegate {
 
   // Note: |tab_client_data| may be null (e.g., if |from_last_session| is true,
   // as the tab client data is not persisted, or if the embedder did not supply
-  virtual content::WebContents* ReplaceRestoredTab(
+  virtual sessions::OpenTab* ReplaceRestoredTab(
       const std::vector<sessions::SerializedNavigationEntry>& navigations,
       int selected_navigation,
       bool from_last_session,