Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/sessions/persistent_tab_restore_service.cc

 // Copyright 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.
 
 #include "chrome/browser/sessions/persistent_tab_restore_service.h"
 
 #include <cstring>  // memcpy
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "components/sessions/base_session_service.h"
 #include "components/sessions/base_session_service_commands.h"
 #include "components/sessions/base_session_service_delegate.h"
 #include "components/sessions/core/session_constants.h"
 #include "components/sessions/session_command.h"
 
+using sessions::LiveTab;
+
 namespace {
 
 // Only written if the tab is pinned.
 typedef bool PinnedStatePayload;
 
 typedef int32 RestoredEntryPayload;
 
 typedef std::map<SessionID::id_type, TabRestoreService::Entry*> IDToEntry;
 
 // Payload used for the start of a tab close. This is the old struct that is
@@ skipping 902 matching lines @@
 void PersistentTabRestoreService::AddObserver(
     TabRestoreServiceObserver* observer) {
   helper_.AddObserver(observer);
 }
 
 void PersistentTabRestoreService::RemoveObserver(
     TabRestoreServiceObserver* observer) {
   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(
     TabRestoreServiceDelegate* delegate) {
   helper_.BrowserClosing(delegate);
 }
 
 void PersistentTabRestoreService::BrowserClosed(
     TabRestoreServiceDelegate* delegate) {
   helper_.BrowserClosed(delegate);
 }
 
 void PersistentTabRestoreService::ClearEntries() {
   helper_.ClearEntries();
 }
 
 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);
 }
 
 TabRestoreService::Tab* PersistentTabRestoreService::RemoveTabEntryById(
     SessionID::id_type id) {
   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,
     WindowOpenDisposition disposition) {
   return helper_.RestoreEntryById(delegate, id, host_desktop_type, disposition);
 }
 
 bool PersistentTabRestoreService::IsLoaded() const {
   return delegate_->IsLoaded();
 }
@@ skipping 10 matching lines @@
   delegate_->LoadTabsFromLastSession();
 }
 
 TabRestoreService::Entries* PersistentTabRestoreService::mutable_entries() {
   return &helper_.entries_;
 }
 
 void PersistentTabRestoreService::PruneEntries() {
   helper_.PruneEntries();
 }