Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/memory/tab_manager.cc

Index: chrome/browser/memory/tab_manager.cc
diff --git a/chrome/browser/memory/tab_manager.cc b/chrome/browser/memory/tab_manager.cc
index 7124a5c13dc1a74f8caeb87d4c915b63d2f4f2fd..02f5ccf327b90ccec8364e5dc2f7f4fbf039b71e 100644
--- a/chrome/browser/memory/tab_manager.cc
+++ b/chrome/browser/memory/tab_manager.cc
@@ -205,19 +205,8 @@ TabStatsList TabManager::GetTabStats() {
   TabStatsList stats_list;
   stats_list.reserve(32);  // 99% of users have < 30 tabs open
 
-  // Go through each window to get all the tabs. Depending on the platform,
-  // windows are either native or ash or both. The goal is to make sure to go
-  // through them all, starting with the active window first (use
-  // chrome::GetActiveDesktop to get the current used type).
-  AddTabStats(BrowserList::GetInstance(chrome::GetActiveDesktop()), true,
-              &stats_list);
-  if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_NATIVE) {
-    AddTabStats(BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE),
-                false, &stats_list);
-  } else if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) {
-    AddTabStats(BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH), false,
-                &stats_list);
-  }
+  // Go through each window to get all the tabs.
+  AddTabStats(BrowserList::GetInstance(), true, &stats_list);

[sky, 2016/01/27 02:41:44]

Can you remove BrowserList as an arg to AddTabStats and look it up there?

[scottmg, 2016/01/27 18:10:32]

Done.

 
   // Sort the collected data so that least desirable to be killed is first, most
   // desirable is last.
@@ -460,8 +449,7 @@ void TabManager::UpdateTimerCallback() {
   if (g_browser_process->IsShuttingDown())
     return;
 
-  if (BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH)->empty() &&
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->empty())
+  if (BrowserList::GetInstance()->empty())
     return;
 
   // Check for a discontinuity in time caused by the machine being suspended.