Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/sessions/in_memory_tab_restore_service.cc

 // 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.
 
 #include "chrome/browser/sessions/in_memory_tab_restore_service.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 
+using sessions::LiveTab;
+
 InMemoryTabRestoreService::InMemoryTabRestoreService(
     scoped_ptr<sessions::TabRestoreServiceClient> client,
     TabRestoreService::TimeFactory* time_factory)
     : client_(client.Pass()),
       helper_(this, NULL, client_.get(), time_factory) {}
 
 InMemoryTabRestoreService::~InMemoryTabRestoreService() {}
 
 void InMemoryTabRestoreService::AddObserver(
     TabRestoreServiceObserver* observer) {
   helper_.AddObserver(observer);
 }
 
 void InMemoryTabRestoreService::RemoveObserver(
     TabRestoreServiceObserver* observer) {
   helper_.RemoveObserver(observer);
 }
 
-void InMemoryTabRestoreService::CreateHistoricalTab(
-    content::WebContents* contents,
-    int index) {
-  helper_.CreateHistoricalTab(contents, index);
+void InMemoryTabRestoreService::CreateHistoricalTab(LiveTab* live_tab,
+                                                    int index) {
+  helper_.CreateHistoricalTab(live_tab, index);
 }
 
 void InMemoryTabRestoreService::BrowserClosing(
     TabRestoreServiceDelegate* delegate) {
   helper_.BrowserClosing(delegate);
 }
 
 void InMemoryTabRestoreService::BrowserClosed(
     TabRestoreServiceDelegate* delegate) {
   helper_.BrowserClosed(delegate);
 }
 
 void InMemoryTabRestoreService::ClearEntries() {
   helper_.ClearEntries();
 }
 
 const TabRestoreService::Entries& InMemoryTabRestoreService::entries() const {
   return helper_.entries();
 }
 
-std::vector<content::WebContents*>
-InMemoryTabRestoreService::RestoreMostRecentEntry(
+std::vector<LiveTab*> InMemoryTabRestoreService::RestoreMostRecentEntry(
     TabRestoreServiceDelegate* delegate,
     int host_desktop_type) {
   return helper_.RestoreMostRecentEntry(delegate, host_desktop_type);
 }
 
 TabRestoreService::Tab* InMemoryTabRestoreService::RemoveTabEntryById(
     SessionID::id_type id) {
   return helper_.RemoveTabEntryById(id);
 }
 
-std::vector<content::WebContents*> InMemoryTabRestoreService::RestoreEntryById(
+std::vector<LiveTab*> InMemoryTabRestoreService::RestoreEntryById(
     TabRestoreServiceDelegate* delegate,
     SessionID::id_type id,
     int host_desktop_type,
     WindowOpenDisposition disposition) {
   return helper_.RestoreEntryById(delegate, id, host_desktop_type, disposition);
 }
 
 void InMemoryTabRestoreService::LoadTabsFromLastSession() {
   // Do nothing. This relies on tab persistence which is implemented in Java on
   // the application side on Android.
 }
 
 bool InMemoryTabRestoreService::IsLoaded() const {
   // See comment above.
   return true;
 }
 
 void InMemoryTabRestoreService::DeleteLastSession() {
   // See comment above.
 }
 
 void InMemoryTabRestoreService::Shutdown() {
 }