Abstract WebContents/NavigationController from core TabRestore code

chrome/browser/android/tab_android.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/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/histogram.h"
@@ skipping 45 matching lines @@
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_container.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
+#include "components/sessions/content/content_live_tab.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 653 matching lines @@
 
   // Exclude internal pages from being marked as recent when they are closed.
   const GURL& tab_url = web_contents->GetURL();
   if (tab_url.SchemeIs(content::kChromeUIScheme) ||
       tab_url.SchemeIs(chrome::kChromeNativeScheme) ||
       tab_url.SchemeIs(url::kAboutScheme)) {
     return;
   }
 
   // TODO(jcivelli): is the index important?
-  service->CreateHistoricalTab(web_contents, -1);
+  service->CreateHistoricalTab(
+      sessions::ContentLiveTab::FromWebContents(web_contents), -1);
 }
 
 void TabAndroid::CreateHistoricalTab(JNIEnv* env, jobject obj) {
   TabAndroid::CreateHistoricalTabFromContents(web_contents());
 }
 
 void TabAndroid::UpdateTopControlsState(JNIEnv* env,
                                         jobject obj,
                                         jint constraints,
                                         jint current,
@@ skipping 227 matching lines @@
   //   s^{n+1} / s^{n} = 2100 / 2000
   //   s = 1.05
   //   s^b = 60000
   //   b = ln(60000) / ln(1.05) ~= 225
   UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime",
       base::Time::Now() - chrome::android::GetMainEntryPointTime(),
       base::TimeDelta::FromMilliseconds(1),
       base::TimeDelta::FromMinutes(1),
       225);
 }