Remove BrowserIterator

chrome/browser/ui/browser_list.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_list.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 
 using base::UserMetricsAction;
 using content::WebContents;
 
 // static
@@ skipping 76 matching lines @@
 }
 
 // static
 void BrowserList::RemoveObserver(chrome::BrowserListObserver* observer) {
   observers_.Get().RemoveObserver(observer);
 }
 
 // static
 void BrowserList::CloseAllBrowsersWithProfile(Profile* profile) {
   BrowserVector browsers_to_close;
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    if (it->profile()->GetOriginalProfile() == profile->GetOriginalProfile())
-      browsers_to_close.push_back(*it);
+  for (auto& browser : *BrowserList::GetInstance()) {
+    if (browser->profile()->GetOriginalProfile() ==
+        profile->GetOriginalProfile())
+      browsers_to_close.push_back(browser);
   }
 
   for (BrowserVector::const_iterator it = browsers_to_close.begin();
        it != browsers_to_close.end(); ++it) {
     (*it)->window()->Close();
   }
 }
 
 // static
 void BrowserList::CloseAllBrowsersWithProfile(Profile* profile,
     const base::Callback<void(const base::FilePath&)>& on_close_success) {
   BrowserVector browsers_to_close;
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    if (it->profile()->GetOriginalProfile() == profile->GetOriginalProfile())
-      browsers_to_close.push_back(*it);
+  for (auto& browser : *BrowserList::GetInstance()) {
+    if (browser->profile()->GetOriginalProfile() ==
+        profile->GetOriginalProfile())
+      browsers_to_close.push_back(browser);
   }
 
   TryToCloseBrowserList(browsers_to_close,
                         on_close_success,
                         profile->GetPath());
 }
 
 // static
 void BrowserList::TryToCloseBrowserList(const BrowserVector& browsers_to_close,
     const base::Callback<void(const base::FilePath&)>& on_close_success,
@@ skipping 47 matching lines @@
 
   RemoveBrowserFrom(browser, &GetInstance()->last_active_browsers_);
   GetInstance()->last_active_browsers_.push_back(browser);
 
   FOR_EACH_OBSERVER(chrome::BrowserListObserver, observers_.Get(),
                     OnBrowserSetLastActive(browser));
 }
 
 // static
 bool BrowserList::IsOffTheRecordSessionActive() {
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    if (it->profile()->IsOffTheRecord())
+  for (auto& browser : *BrowserList::GetInstance()) {
+    if (browser->profile()->IsOffTheRecord())
       return true;
   }
   return false;
 }
 
 // static
 bool BrowserList::IsOffTheRecordSessionActiveForProfile(Profile* profile) {
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    if (it->profile()->IsSameProfile(profile) &&
-        it->profile()->IsOffTheRecord()) {
+  for (auto& browser : *BrowserList::GetInstance()) {
+    if (browser->profile()->IsSameProfile(profile) &&
+        browser->profile()->IsOffTheRecord()) {
       return true;
     }
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserList, private:
 
 BrowserList::BrowserList() {
 }
 
 BrowserList::~BrowserList() {
 }
 
 // static
 void BrowserList::RemoveBrowserFrom(Browser* browser,
                                     BrowserVector* browser_list) {
   BrowserVector::iterator remove_browser =
       std::find(browser_list->begin(), browser_list->end(), browser);
   if (remove_browser != browser_list->end())
     browser_list->erase(remove_browser);
 }