Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/ui/browser_tab_strip_model_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_strip_model_delegate.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/task_management/web_contents_tags.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/fast_unload_controller.h"
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/unload_controller.h"
 #include "chrome/common/chrome_switches.h"
+#include "components/sessions/content/content_live_tab.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ipc/ipc_message.h"
 
 namespace chrome {
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripModelDelegate, public:
 
@@ skipping 77 matching lines @@
   // profiles.
   if (!browser_->profile() || browser_->profile()->IsOffTheRecord())
     return;
 
   TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser_->profile());
 
   // We only create historical tab entries for tabbed browser windows.
   if (service && browser_->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
     service->CreateHistoricalTab(
-        contents,
+        sessions::ContentLiveTab::FromWebContents(contents),
         browser_->tab_strip_model()->GetIndexOfWebContents(contents));
   }
 }
 
 bool BrowserTabStripModelDelegate::RunUnloadListenerBeforeClosing(
     content::WebContents* contents) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableFastUnload)) {
     return chrome::FastUnloadController::RunUnloadEventsHelper(contents);
   }
@@ skipping 27 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripModelDelegate, private:
 
 void BrowserTabStripModelDelegate::CloseFrame() {
   browser_->window()->Close();
 }
 
 }  // namespace chrome