New Public IdFromWebContents method on TabManager.

chrome/browser/memory/tab_manager.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/memory/tab_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 70 matching lines @@
 #endif
 
 // If there has been no priority adjustment in this interval, assume the
 // machine was suspended and correct the timing statistics.
 const int kSuspendThresholdSeconds = kAdjustmentIntervalSeconds * 4;
 
 // The time during which a tab is protected from discarding after it stops being
 // audible.
 const int kAudioProtectionTimeSeconds = 60;
 
-// Returns a unique ID for a WebContents. Do not cast back to a pointer, as
-// the WebContents could be deleted if the user closed the tab.
-int64_t IdFromWebContents(WebContents* web_contents) {
-  return reinterpret_cast<int64_t>(web_contents);
-}
-
 int FindTabStripModelById(int64_t target_web_contents_id,
                           TabStripModel** model) {
   DCHECK(model);
   for (auto* browser : *BrowserList::GetInstance()) {
     TabStripModel* local_model = browser->tab_strip_model();
     for (int idx = 0; idx < local_model->count(); idx++) {
       WebContents* web_contents = local_model->GetWebContentsAt(idx);
-      int64_t web_contents_id = IdFromWebContents(web_contents);
+      int64_t web_contents_id = TabManager::IdFromWebContents(web_contents);
       if (web_contents_id == target_web_contents_id) {
         *model = local_model;
         return idx;
       }
     }
   }
 
   return -1;
 }
 
@@ skipping 230 matching lines @@
   if (index == -1)
     return nullptr;
 
   VLOG(1) << "Discarding tab " << index << " id " << target_web_contents_id;
 
   return DiscardWebContentsAt(index, model);
 }
 
 WebContents* TabManager::DiscardTabByExtension(content::WebContents* contents) {
   if (contents)
-    return DiscardTabById(reinterpret_cast<int64_t>(contents));
+    return DiscardTabById(IdFromWebContents(contents));
 
   return DiscardTabImpl();
 }
 
 void TabManager::LogMemoryAndDiscardTab() {
   LogMemory("Tab Discards Memory details",
             base::Bind(&TabManager::PurgeMemoryAndDiscardTab));
 }
 
 void TabManager::LogMemory(const std::string& title,
@@ skipping 92 matching lines @@
   // order. This is currently not done because pages with unload handlers set
   // sudden_termination_allowed false, and that covers too many common pages
   // with ad networks and statistics scripts.  Ideally check for beforeUnload
   // handlers, which are likely to present a dialog asking if the user wants to
   // discard state.  crbug.com/123049.
 
   // Being more recently active is more important.
   return first.last_active > second.last_active;
 }
 
+// static
+int64_t TabManager::IdFromWebContents(WebContents* web_contents) {
+  return reinterpret_cast<int64_t>(web_contents);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // TabManager, private:
 
 void TabManager::OnDiscardedStateChange(content::WebContents* contents,
                                         bool is_discarded) {
   FOR_EACH_OBSERVER(TabManagerObserver, observers_,
                     OnDiscardedStateChange(contents, is_discarded));
 }
 
 void TabManager::OnAutoDiscardableStateChange(content::WebContents* contents,
@@ skipping 460 matching lines @@
   // platform.
   std::string allow_multiple_discards = variations::GetVariationParamValue(
       features::kAutomaticTabDiscarding.name, "AllowMultipleDiscards");
   return (allow_multiple_discards != "true");
 #else
   return false;
 #endif
 }
 
 }  // namespace memory