Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/ui/panels/panel_host.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/panels/panel_host.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/favicon/favicon_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "components/favicon/content/content_favicon_driver.h"
+#include "components/sessions/content/content_open_tab.h"
 #include "components/ui/zoom/page_zoom.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 27 matching lines @@
   // a ZoomController.
   ui_zoom::ZoomController::CreateForWebContents(web_contents_.get());
   content::WebContentsObserver::Observe(web_contents_.get());
 
   // Needed to give the web contents a Tab ID. Extension APIs
   // expect web contents to have a Tab ID.
   SessionTabHelper::CreateForWebContents(web_contents_.get());
   SessionTabHelper::FromWebContents(web_contents_.get())->SetWindowID(
       panel_->session_id());
 
+  sessions::ContentOpenTab::CreateForWebContents(web_contents_.get());

[sky, 2015/09/16 20:04:53]

It would be nice not to have to do this in a bunch of different place. How about
ContentOpenTab::Get() that does the creation if necessary?

[blundell, 2015/09/16 20:19:42]

AFAIK lazy initialization isn't done for WebContentsUserData, although it is
what's done for KeyedService. Adding avi@ for his opinion.

[blundell, 2015/09/17 11:52:25]

Removed all the unnecessary callsites, leaving only one in tab_helpers.cc. Does
that eliminate this concern?

+
   favicon::CreateContentFaviconDriverForWebContents(web_contents_.get());
   PrefsTabHelper::CreateForWebContents(web_contents_.get());
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents_.get());
   extensions::ExtensionWebContentsObserver::GetForWebContents(
       web_contents_.get())->dispatcher()->set_delegate(this);
 
   web_contents_->GetController().LoadURL(
       url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
 }
@@ skipping 160 matching lines @@
 }
 
 void PanelHost::StopLoading() {
   content::RecordAction(UserMetricsAction("Stop"));
   web_contents_->Stop();
 }
 
 void PanelHost::Zoom(content::PageZoom zoom) {
   ui_zoom::PageZoom::Zoom(web_contents_.get(), zoom);
 }