Remove BrowserIterator

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"
-#include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/navigation_controller.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "components/signin/core/account_id/account_id.h"
@@ skipping 147 matching lines @@
                                         false,
                                         match_original_profiles);
 }
 
 Browser* FindBrowserWithProfile(Profile* profile,
                                 HostDesktopType desktop_type) {
   return FindBrowserWithTabbedOrAnyType(profile, desktop_type, false, false);
 }
 
 Browser* FindBrowserWithID(SessionID::id_type desired_id) {
-  for (BrowserIterator it; !it.done(); it.Next()) {
-    if (it->session_id().id() == desired_id)
-      return *it;
+  for (auto& browser : *BrowserList::GetInstance()) {
+    if (browser->session_id().id() == desired_id)
+      return browser;
   }
   return NULL;
 }
 
 Browser* FindBrowserWithWindow(gfx::NativeWindow window) {
   if (!window)
     return NULL;
-  for (BrowserIterator it; !it.done(); it.Next()) {
-    Browser* browser = *it;
+  for (auto& browser : *BrowserList::GetInstance()) {
     if (browser->window() && browser->window()->GetNativeWindow() == window)
       return browser;
   }
   return NULL;
 }
 
 Browser* FindBrowserWithWebContents(const WebContents* web_contents) {
   DCHECK(web_contents);
   for (TabContentsIterator it; !it.done(); it.Next()) {
     if (*it == web_contents)
@@ skipping 32 matching lines @@
 
 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