Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/ui/browser_tab_restore_service_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_TAB_RESTORE_SERVICE_DELEGATE_H_
 #define CHROME_BROWSER_UI_BROWSER_TAB_RESTORE_SERVICE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/ui/host_desktop.h"
 
 class Browser;
 class Profile;
 
+namespace content {
+class WebContents;
+}
+
 // Implementation of TabRestoreServiceDelegate which uses an instance of
 // Browser in order to fulfil its duties.
 class BrowserTabRestoreServiceDelegate : public TabRestoreServiceDelegate {
  public:
   explicit BrowserTabRestoreServiceDelegate(Browser* browser)
       : browser_(browser) {}
   ~BrowserTabRestoreServiceDelegate() override {}
 
   // Overridden from TabRestoreServiceDelegate:
   void ShowBrowserWindow() override;
   const SessionID& GetSessionID() const override;
   int GetTabCount() const override;
   int GetSelectedIndex() const override;
   std::string GetAppName() const override;
-  content::WebContents* GetWebContentsAt(int index) const override;
-  content::WebContents* GetActiveWebContents() const override;
+  sessions::LiveTab* GetLiveTabAt(int index) const override;
+  sessions::LiveTab* GetActiveLiveTab() const override;
   bool IsTabPinned(int index) const override;
-  content::WebContents* AddRestoredTab(
+  sessions::LiveTab* AddRestoredTab(
       const std::vector<sessions::SerializedNavigationEntry>& navigations,
       int tab_index,
       int selected_navigation,
       const std::string& extension_app_id,
       bool select,
       bool pin,
       bool from_last_session,
       const sessions::TabClientData* storage_namespace,
       const std::string& user_agent_override) override;
-  content::WebContents* ReplaceRestoredTab(
+  sessions::LiveTab* ReplaceRestoredTab(
       const std::vector<sessions::SerializedNavigationEntry>& navigations,
       int selected_navigation,
       bool from_last_session,
       const std::string& extension_app_id,
       const sessions::TabClientData* tab_client_data,
       const std::string& user_agent_override) override;
   void CloseTab() override;
 
   // see Browser::Create
   static TabRestoreServiceDelegate* Create(
@@ skipping 12 matching lines @@
       SessionID::id_type desired_id,
       chrome::HostDesktopType host_desktop_type);
 
  private:
   Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserTabRestoreServiceDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_TAB_RESTORE_SERVICE_DELEGATE_H_