Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/ui/browser_list.cc

Index: chrome/browser/ui/browser_list.cc
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 3057802817646bce2d538c1688e48128842cf3da..a02cb9958da2c8785d2ae4daff51294e411d53d7 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -30,8 +30,7 @@ base::LazyInstance<base::ObserverList<chrome::BrowserListObserver>>::Leaky
     BrowserList::observers_ = LAZY_INSTANCE_INITIALIZER;
 
 // static
-BrowserList* BrowserList::native_instance_ = NULL;
-BrowserList* BrowserList::ash_instance_ = NULL;
+BrowserList* BrowserList::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserList, public:
@@ -43,14 +42,9 @@ Browser* BrowserList::GetLastActive() const {
 }
 
 // static
-BrowserList* BrowserList::GetInstance(chrome::HostDesktopType type) {
+BrowserList* BrowserList::GetInstance() {
   BrowserList** list = NULL;
-  if (type == chrome::HOST_DESKTOP_TYPE_NATIVE)
-    list = &native_instance_;
-  else if (type == chrome::HOST_DESKTOP_TYPE_ASH)
-    list = &ash_instance_;
-  else
-    NOTREACHED();
+  list = &instance_;
   if (!*list)
     *list = new BrowserList;
   return *list;
@@ -59,9 +53,7 @@ BrowserList* BrowserList::GetInstance(chrome::HostDesktopType type) {
 // static
 void BrowserList::AddBrowser(Browser* browser) {
   DCHECK(browser);
-  // Push |browser| on the appropriate list instance.
-  BrowserList* browser_list = GetInstance(browser->host_desktop_type());
-  browser_list->browsers_.push_back(browser);
+  GetInstance()->browsers_.push_back(browser);
 
   g_browser_process->AddRefModule();
 
@@ -77,7 +69,7 @@ void BrowserList::AddBrowser(Browser* browser) {
 // static
 void BrowserList::RemoveBrowser(Browser* browser) {
   // Remove |browser| from the appropriate list instance.
-  BrowserList* browser_list = GetInstance(browser->host_desktop_type());
+  BrowserList* browser_list = GetInstance();
   RemoveBrowserFrom(browser, &browser_list->last_active_browsers_);
 
   content::NotificationService::current()->Notify(
@@ -195,10 +187,9 @@ void BrowserList::PostBeforeUnloadHandlers(
 // static
 void BrowserList::SetLastActive(Browser* browser) {
   content::RecordAction(UserMetricsAction("ActiveBrowserChanged"));
-  BrowserList* browser_list = GetInstance(browser->host_desktop_type());
 
-  RemoveBrowserFrom(browser, &browser_list->last_active_browsers_);
-  browser_list->last_active_browsers_.push_back(browser);
+  RemoveBrowserFrom(browser, &GetInstance()->last_active_browsers_);
+  GetInstance()->last_active_browsers_.push_back(browser);
 
   FOR_EACH_OBSERVER(chrome::BrowserListObserver, observers_.Get(),
                     OnBrowserSetLastActive(browser));