Remove BrowserIterator

chrome/browser/lifetime/application_lifetime.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/lifetime/application_lifetime.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/process/process.h"
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/lifetime/browser_close_manager.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.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_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 
@@ skipping 10 matching lines @@
 #endif
 
 namespace chrome {
 namespace {
 
 #if !defined(OS_ANDROID)
 // Returns true if all browsers can be closed without user interaction.
 // This currently checks if there is pending download, or if it needs to
 // handle unload handler.
 bool AreAllBrowsersCloseable() {
-  chrome::BrowserIterator browser_it;
-  if (browser_it.done())
+  if (BrowserList::GetInstance()->empty())
     return true;
 
   // If there are any downloads active, all browsers are not closeable.
   // However, this does not block for malicious downloads.
   if (DownloadService::NonMaliciousDownloadCountAllProfiles() > 0)
     return false;
 
   // Check TabsNeedBeforeUnloadFired().
-  for (; !browser_it.done(); browser_it.Next()) {
-    if (browser_it->TabsNeedBeforeUnloadFired())
+  for (auto& browser : *BrowserList::GetInstance()) {
+    if (browser->TabsNeedBeforeUnloadFired())
       return false;
   }
   return true;
 }
 #endif  // !defined(OS_ANDROID)
 
 int g_keep_alive_count = 0;
 bool g_disable_shutdown_for_testing = false;
 
 #if defined(OS_CHROMEOS)
 // Whether chrome should send stop request to a session manager.
 bool g_send_stop_request_to_session_manager = false;
 #endif
 
 }  // namespace
 
 void MarkAsCleanShutdown() {
   // TODO(beng): Can this use ProfileManager::GetLoadedProfiles() instead?
-  for (chrome::BrowserIterator it; !it.done(); it.Next())
-    it->profile()->SetExitType(Profile::EXIT_NORMAL);
+  for (auto& browser : *BrowserList::GetInstance())
+    browser->profile()->SetExitType(Profile::EXIT_NORMAL);
 }
 
 void AttemptExitInternal(bool try_to_quit_application) {
   // On Mac, the platform-specific part handles setting this.
 #if !defined(OS_MACOSX)
   if (try_to_quit_application)
     browser_shutdown::SetTryingToQuit(true);
 #endif
 
   content::NotificationService::current()->Notify(
@@ skipping 70 matching lines @@
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, false);
   AttemptExitInternal(false);
 #endif
 }
 
 // The Android implementation is in application_lifetime_android.cc
 #if !defined(OS_ANDROID)
 void AttemptRestart() {
   // TODO(beng): Can this use ProfileManager::GetLoadedProfiles instead?
-  for (chrome::BrowserIterator it; !it.done(); it.Next())
-    content::BrowserContext::SaveSessionState(it->profile());
+  for (auto& browser : *BrowserList::GetInstance())
+    content::BrowserContext::SaveSessionState(browser->profile());
 
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kWasRestarted, true);
 
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesRecorder::Get()->set_restart_requested();
 
   DCHECK(!g_send_stop_request_to_session_manager);
   // Make sure we don't send stop request to the session manager.
   g_send_stop_request_to_session_manager = false;
@@ skipping 176 matching lines @@
   HandleAppExitingForPlatform();
 }
 
 void DisableShutdownForTesting(bool disable_shutdown_for_testing) {
   g_disable_shutdown_for_testing = disable_shutdown_for_testing;
   if (!g_disable_shutdown_for_testing && !WillKeepAlive())
     CloseAllBrowsersIfNeeded();
 }
 
 }  // namespace chrome