Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/ui/browser_finder.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/ui/browser_finder.h"
 
 #include <stdint.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 94 matching lines @@
     if (BrowserMatches(*i, profile, window_feature, match_types))
       return *i;
   }
   return NULL;
 }
 
 Browser* FindBrowserWithTabbedOrAnyType(Profile* profile,
                                         chrome::HostDesktopType desktop_type,
                                         bool match_tabbed,
                                         bool match_original_profiles) {
-  BrowserList* browser_list_impl = BrowserList::GetInstance(desktop_type);
+  BrowserList* browser_list_impl = BrowserList::GetInstance();
   if (!browser_list_impl)
     return NULL;
   uint32_t match_types = kMatchAny;
   if (match_tabbed)
     match_types |= kMatchTabbed;
   if (match_original_profiles)
     match_types |= kMatchOriginalProfile;
   Browser* browser = FindBrowserMatching(browser_list_impl->begin_last_active(),
                                          browser_list_impl->end_last_active(),
                                          profile,
                                          Browser::FEATURE_NONE,
                                          match_types);
   // Fall back to a forward scan of all Browsers if no active one was found.
   return browser ? browser : FindBrowserMatching(browser_list_impl->begin(),
                                                  browser_list_impl->end(),
                                                  profile,
                                                  Browser::FEATURE_NONE,
                                                  match_types);
 }
 
 size_t GetBrowserCountImpl(Profile* profile,
                            chrome::HostDesktopType desktop_type,
                            uint32_t match_types) {
-  BrowserList* browser_list_impl = BrowserList::GetInstance(desktop_type);
+  BrowserList* browser_list_impl = BrowserList::GetInstance();
   size_t count = 0;
   if (browser_list_impl) {
     for (BrowserList::const_iterator i = browser_list_impl->begin();
          i != browser_list_impl->end(); ++i) {
       if (BrowserMatches(*i, profile, Browser::FEATURE_NONE, match_types))
         count++;
     }
   }
   return count;
 }
@@ skipping 47 matching lines @@
 Browser* FindBrowserWithWebContents(const WebContents* web_contents) {
   DCHECK(web_contents);
   for (TabContentsIterator it; !it.done(); it.Next()) {
     if (*it == web_contents)
       return it.browser();
   }
   return NULL;
 }
 
 Browser* FindLastActiveWithProfile(Profile* profile, HostDesktopType type) {
-  BrowserList* list = BrowserList::GetInstance(type);
+  BrowserList* list = BrowserList::GetInstance();
   // We are only interested in last active browsers, so we don't fall back to
   // all browsers like FindBrowserWith* do.
   return FindBrowserMatching(list->begin_last_active(), list->end_last_active(),
                              profile, Browser::FEATURE_NONE, kMatchAny);
 }
 
 Browser* FindLastActiveWithHostDesktopType(HostDesktopType type) {
-  BrowserList* browser_list_impl = BrowserList::GetInstance(type);
+  BrowserList* browser_list_impl = BrowserList::GetInstance();
   if (browser_list_impl)
     return browser_list_impl->GetLastActive();
   return NULL;
 }
 
 size_t GetTotalBrowserCount() {
-  size_t count = 0;
-  for (HostDesktopType t = HOST_DESKTOP_TYPE_FIRST; t < HOST_DESKTOP_TYPE_COUNT;
-       t = static_cast<HostDesktopType>(t + 1)) {
-    count += BrowserList::GetInstance(t)->size();
-  }
-  return count;
+  return BrowserList::GetInstance()->size();
 }
 
 size_t GetTotalBrowserCountForProfile(Profile* profile) {
   size_t count = 0;
   for (HostDesktopType t = HOST_DESKTOP_TYPE_FIRST; t < HOST_DESKTOP_TYPE_COUNT;
        t = static_cast<HostDesktopType>(t + 1)) {
     count += GetBrowserCount(profile, t);
   }
   return count;
 }
 
 size_t GetBrowserCount(Profile* profile, HostDesktopType type) {
   return GetBrowserCountImpl(profile, type, kMatchAny);
 }
 
 size_t GetTabbedBrowserCount(Profile* profile, HostDesktopType type) {
   return GetBrowserCountImpl(profile, type, kMatchTabbed);
 }
 
 }  // namespace chrome