Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls.

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/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/download/download_service.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/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_shutdown.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 81 matching lines @@
 
 #if defined(ENABLE_SESSION_SERVICE)
   // Before we close the browsers shutdown all session services. That way an
   // exit can restore all browsers open before exiting.
   ProfileManager::ShutdownSessionServices();
 #endif
 
   // If there are no browsers, send the APP_TERMINATING action here. Otherwise,
   // it will be sent by RemoveBrowser() when the last browser has closed.
   if (browser_shutdown::ShuttingDownWithoutClosingBrowsers() ||
-      BrowserList::empty()) {
+      chrome::GetTotalBrowserCount() == 0) {
     chrome::NotifyAndTerminate(true);
     chrome::OnAppExiting();
     return;
   }
 
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker(
       "StartedClosingWindows", false);
 #endif
   for (scoped_ptr<chrome::BrowserIterator> it_ptr(
@@ skipping 180 matching lines @@
   // Although we should have a browser process, if there is none,
   // there is nothing to do.
   if (!g_browser_process) return;
 
   // Allow the app to shutdown again.
   if (!WillKeepAlive()) {
     g_browser_process->ReleaseModule();
     // If there are no browsers open and we aren't already shutting down,
     // initiate a shutdown. Also skips shutdown if this is a unit test
     // (MessageLoop::current() == null).
-    if (BrowserList::empty() && !browser_shutdown::IsTryingToQuit() &&
-        MessageLoop::current())
+    if (chrome::GetTotalBrowserCount() == 0 &&
+        !browser_shutdown::IsTryingToQuit() &&
+        MessageLoop::current()) {
       browser::CloseAllBrowsers();
+    }
   }
 }
 
 bool WillKeepAlive() {
   return browser::g_keep_alive_count > 0;
 }
 
 void NotifyAppTerminating() {
   static bool notified = false;
   if (notified)
@@ skipping 43 matching lines @@
 
 void OnAppExiting() {
   static bool notified = false;
   if (notified)
     return;
   notified = true;
   HandleAppExitingForPlatform();
 }
 
 }  // namespace chrome