Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/extensions/api/sessions/sessions_api.cc

 // Copyright 2013 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/extensions/api/sessions/sessions_api.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
+#include "components/sessions/content/content_live_tab.h"
 #include "components/sync_driver/glue/synced_session.h"
 #include "components/sync_driver/open_tabs_ui_delegate.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/error_utils.h"
 #include "ui/base/layout.h"
 
@@ skipping 404 matching lines @@
 
   if (entries.empty()) {
     SetError(kNoRecentlyClosedSessionsError);
     return false;
   }
 
   bool is_window = is_window_entry(entries.front());
   TabRestoreServiceDelegate* delegate =
       BrowserTabRestoreServiceDelegate::FindDelegateForWebContents(
           browser->tab_strip_model()->GetActiveWebContents());
-  std::vector<content::WebContents*> contents =
+  std::vector<sessions::LiveTab*> restored_tabs =
       tab_restore_service->RestoreMostRecentEntry(delegate, host_desktop_type);
-  DCHECK(contents.size());
+  DCHECK(restored_tabs.size());
 
+  sessions::ContentLiveTab* first_tab =
+      static_cast<sessions::ContentLiveTab*>(restored_tabs[0]);
   if (is_window) {
     return SetResultRestoredWindow(
-        ExtensionTabUtil::GetWindowIdOfTab(contents[0]));
+        ExtensionTabUtil::GetWindowIdOfTab(first_tab->web_contents()));
   }
 
-  SetResultRestoredTab(contents[0]);
+  SetResultRestoredTab(first_tab->web_contents());
   return true;
 }
 
 bool SessionsRestoreFunction::RestoreLocalSession(const SessionId& session_id,
                                                   Browser* browser) {
   TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(GetProfile());
   chrome::HostDesktopType host_desktop_type = browser->host_desktop_type();
   TabRestoreService::Entries entries = tab_restore_service->entries();
 
@@ skipping 10 matching lines @@
       // The only time a full window is being restored is if the entry ID
       // matches the provided ID and the entry type is Window.
       is_window = is_window_entry(*it);
       break;
     }
   }
 
   TabRestoreServiceDelegate* delegate =
       BrowserTabRestoreServiceDelegate::FindDelegateForWebContents(
           browser->tab_strip_model()->GetActiveWebContents());
-  std::vector<content::WebContents*> contents =
-      tab_restore_service->RestoreEntryById(delegate,
-                                            session_id.id(),
-                                            host_desktop_type,
-                                            UNKNOWN);
-  // If the ID is invalid, contents will be empty.
-  if (!contents.size()) {
+  std::vector<sessions::LiveTab*> restored_tabs =
+      tab_restore_service->RestoreEntryById(delegate, session_id.id(),
+                                            host_desktop_type, UNKNOWN);
+  // If the ID is invalid, restored_tabs will be empty.
+  if (!restored_tabs.size()) {
     SetInvalidIdError(session_id.ToString());
     return false;
   }
 
-  // Retrieve the window through any of the tabs in contents.
+  sessions::ContentLiveTab* first_tab =
+      static_cast<sessions::ContentLiveTab*>(restored_tabs[0]);
+
+  // Retrieve the window through any of the tabs in restored_tabs.
   if (is_window) {
     return SetResultRestoredWindow(
-        ExtensionTabUtil::GetWindowIdOfTab(contents[0]));
+        ExtensionTabUtil::GetWindowIdOfTab(first_tab->web_contents()));
   }
 
-  SetResultRestoredTab(contents[0]);
+  SetResultRestoredTab(first_tab->web_contents());
   return true;
 }
 
 bool SessionsRestoreFunction::RestoreForeignSession(const SessionId& session_id,
                                                     Browser* browser) {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(GetProfile());
   if (!(service && service->GetPreferredDataTypes().Has(syncer::SESSIONS))) {
     SetError(kSessionSyncError);
     return false;
@@ skipping 125 matching lines @@
   return g_factory.Pointer();
 }
 
 void SessionsAPI::OnListenerAdded(const EventListenerInfo& details) {
   sessions_event_router_.reset(
       new SessionsEventRouter(Profile::FromBrowserContext(browser_context_)));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 }  // namespace extensions