RC: Mark TabManager::IsTab(InSessionRestore|RestoredInForeground) as static.

These methods don't access member variables, so they can easily be
made static. Making these methods static will avoid having to initialize
TabManager and its dependencies in a bunch of tests.

Bug: 775644
Change-Id: I2ef567c855e34e234faad569126e752460cd2418
Reviewed-on: https://chromium-review.googlesource.com/1132094Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Reviewed-by: Sébastien Marchand <sebmarchand@chromium.org>
Commit-Queue: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574163}

chrome/browser/page_load_metrics/observers/session_restore_page_load_metrics_observer.cc

@@ -36,14 +36,11 @@ SessionRestorePageLoadMetricsObserver::OnStart(
     const GURL& currently_committed_url,
     bool started_in_foreground) {
   content::WebContents* contents = navigation_handle->GetWebContents();
-  resource_coordinator::TabManager* tab_manager =
-      g_browser_process->GetTabManager();
-  // Should not be null because this is used only on supported platforms.
-  DCHECK(tab_manager);
-
-  if (!started_in_foreground || !tab_manager->IsTabInSessionRestore(contents) ||
-      !tab_manager->IsTabRestoredInForeground(contents))
+  if (!started_in_foreground ||
+      !resource_coordinator::TabManager::IsTabInSessionRestore(contents) ||
+      !resource_coordinator::TabManager::IsTabRestoredInForeground(contents)) {
     return STOP_OBSERVING;
+  }
 
   // The navigation should be from the last session.
   DCHECK(navigation_handle->GetRestoreType() ==

chrome/browser/resource_coordinator/tab_manager.cc

@@ -348,14 +348,6 @@ bool TabManager::CanPurgeBackgroundedRenderer(int render_process_id) const {
   return true;
 }
 
-bool TabManager::IsTabInSessionRestore(WebContents* web_contents) const {
-  return GetWebContentsData(web_contents)->is_in_session_restore();
-}
-
-bool TabManager::IsTabRestoredInForeground(WebContents* web_contents) const {
-  return GetWebContentsData(web_contents)->is_restored_in_foreground();
-}
-
 size_t TabManager::GetBackgroundTabLoadingCount() const {
   if (!IsInBackgroundTabOpeningSession())
     return 0;
@@ -377,8 +369,14 @@ int TabManager::GetTabCount() const {
   return tab_count;
 }
 
-int TabManager::restored_tab_count() const {
-  return restored_tab_count_;
+// static
+bool TabManager::IsTabInSessionRestore(WebContents* web_contents) {
+  return GetWebContentsData(web_contents)->is_in_session_restore();
+}
+
+// static
+bool TabManager::IsTabRestoredInForeground(WebContents* web_contents) {
+  return GetWebContentsData(web_contents)->is_restored_in_foreground();
 }
 
 ///////////////////////////////////////////////////////////////////////////////

chrome/browser/resource_coordinator/tab_manager.h

@@ -157,14 +157,6 @@ class TabManager : public LifecycleUnitObserver,
     return is_session_restore_loading_tabs_;
   }
 
-  // Returns true if the tab was created by session restore and has not finished
-  // the first navigation.
-  bool IsTabInSessionRestore(content::WebContents* web_contents) const;
-
-  // Returns true if the tab was created by session restore and initially in
-  // foreground.
-  bool IsTabRestoredInForeground(content::WebContents* web_contents) const;
-
   // Returns the number of background tabs that are loading in a background tab
   // opening session.
   size_t GetBackgroundTabLoadingCount() const;
@@ -178,12 +170,20 @@ class TabManager : public LifecycleUnitObserver,
 
   // Returns the number of restored tabs during session restore. This is
   // non-zero only during session restore.
-  int restored_tab_count() const;
+  int restored_tab_count() const { return restored_tab_count_; }
 
   InterventionPolicyDatabase* intervention_policy_database() {
     return intervention_policy_database_.get();
   }
 
+  // Returns true if the tab was created by session restore and has not finished
+  // the first navigation.
+  static bool IsTabInSessionRestore(content::WebContents* web_contents);
+
+  // Returns true if the tab was created by session restore and initially in
+  // foreground.
+  static bool IsTabRestoredInForeground(content::WebContents* web_contents);
+
  private:
   friend class TabManagerStatsCollectorTest;
   friend class TabManagerWithProactiveDiscardExperimentEnabledTest;