Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/ui/browser_tab_restore_service_delegate.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/ui/browser_tab_restore_service_delegate.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabrestore.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "components/sessions/content/content_open_tab.h"
 #include "components/sessions/content/content_tab_client_data.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/session_storage_namespace.h"
 
 using content::NavigationController;
 using content::SessionStorageNamespace;
 using content::WebContents;
 
 void BrowserTabRestoreServiceDelegate::ShowBrowserWindow() {
   browser_->window()->Show();
 }
 
 const SessionID& BrowserTabRestoreServiceDelegate::GetSessionID() const {
   return browser_->session_id();
 }
 
 int BrowserTabRestoreServiceDelegate::GetTabCount() const {
   return browser_->tab_strip_model()->count();
 }
 
 int BrowserTabRestoreServiceDelegate::GetSelectedIndex() const {
   return browser_->tab_strip_model()->active_index();
 }
 
 std::string BrowserTabRestoreServiceDelegate::GetAppName() const {
   return browser_->app_name();
 }
 
-WebContents* BrowserTabRestoreServiceDelegate::GetWebContentsAt(
+sessions::OpenTab* BrowserTabRestoreServiceDelegate::GetOpenTabAt(
     int index) const {
-  return browser_->tab_strip_model()->GetWebContentsAt(index);
+  return sessions::ContentOpenTab::FromWebContents(
+      browser_->tab_strip_model()->GetWebContentsAt(index));
 }
 
-WebContents* BrowserTabRestoreServiceDelegate::GetActiveWebContents() const {
-  return browser_->tab_strip_model()->GetActiveWebContents();
+sessions::OpenTab* BrowserTabRestoreServiceDelegate::GetActiveOpenTab() const {
+  return sessions::ContentOpenTab::FromWebContents(
+      browser_->tab_strip_model()->GetActiveWebContents());
 }
 
 bool BrowserTabRestoreServiceDelegate::IsTabPinned(int index) const {
   return browser_->tab_strip_model()->IsTabPinned(index);
 }
 
-WebContents* BrowserTabRestoreServiceDelegate::AddRestoredTab(
+sessions::OpenTab* BrowserTabRestoreServiceDelegate::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* tab_client_data,
     const std::string& user_agent_override) {
   SessionStorageNamespace* storage_namespace =
       tab_client_data
           ? static_cast<const sessions::ContentTabClientData*>(tab_client_data)
                 ->session_storage_namespace()
           : nullptr;
-  return chrome::AddRestoredTab(browser_, navigations, tab_index,
-                                selected_navigation, extension_app_id, select,
-                                pin, from_last_session, storage_namespace,
-                                user_agent_override);
+
+  WebContents* web_contents = chrome::AddRestoredTab(
+      browser_, navigations, tab_index, selected_navigation, extension_app_id,
+      select, pin, from_last_session, storage_namespace, user_agent_override);
+
+  return sessions::ContentOpenTab::FromWebContents(web_contents);
 }
 
-WebContents* BrowserTabRestoreServiceDelegate::ReplaceRestoredTab(
+sessions::OpenTab* BrowserTabRestoreServiceDelegate::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) {
   SessionStorageNamespace* storage_namespace =
       tab_client_data
           ? static_cast<const sessions::ContentTabClientData*>(tab_client_data)
                 ->session_storage_namespace()
           : nullptr;
-  return chrome::ReplaceRestoredTab(browser_, navigations, selected_navigation,
-                                    from_last_session, extension_app_id,
-                                    storage_namespace, user_agent_override);
+
+  WebContents* web_contents = chrome::ReplaceRestoredTab(
+      browser_, navigations, selected_navigation, from_last_session,
+      extension_app_id, storage_namespace, user_agent_override);
+
+  return sessions::ContentOpenTab::FromWebContents(web_contents);
 }
 
 void BrowserTabRestoreServiceDelegate::CloseTab() {
   chrome::CloseTab(browser_);
 }
 
 // static
 TabRestoreServiceDelegate* BrowserTabRestoreServiceDelegate::Create(
     Profile* profile,
     chrome::HostDesktopType host_desktop_type,
@@ skipping 12 matching lines @@
     return browser->tab_restore_service_delegate();
   else
     return NULL;
 }
 
 // static
 TabRestoreServiceDelegate*
 BrowserTabRestoreServiceDelegate::FindDelegateForWebContents(
     const WebContents* contents) {
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
-  return browser ? browser->tab_restore_service_delegate() : NULL;
+  return browser ? browser->tab_restore_service_delegate() : nullptr;
 }
 
 // static
 TabRestoreServiceDelegate* BrowserTabRestoreServiceDelegate::FindDelegateWithID(
     SessionID::id_type desired_id,
     chrome::HostDesktopType host_desktop_type) {
   Browser* browser = chrome::FindBrowserWithID(desired_id);
   return (browser && browser->host_desktop_type() == host_desktop_type) ?
              browser->tab_restore_service_delegate() : NULL;
 }