Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives

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/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/lifetime/keep_alive_registry.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_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"
@@ skipping 10 matching lines @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/dbus/update_engine_client.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #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() {
   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 (auto* browser : *BrowserList::GetInstance()) {
     if (browser->TabsNeedBeforeUnloadFired())
       return false;
   }
   return true;
 }
 
-int g_keep_alive_count = 0;
 bool g_disable_shutdown_for_testing = false;
 #endif  // !defined(OS_ANDROID)
 
 #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
 
@@ skipping 22 matching lines @@
 void CloseAllBrowsersAndQuit() {
   browser_shutdown::SetTryingToQuit(true);
   CloseAllBrowsers();
 }
 
 void CloseAllBrowsers() {
   // If there are no browsers and closing the last browser would quit the
   // application, send the APP_TERMINATING action here. Otherwise, it will be
   // sent by RemoveBrowser() when the last browser has closed.
   if (chrome::GetTotalBrowserCount() == 0 &&
-      (browser_shutdown::IsTryingToQuit() || !chrome::WillKeepAlive())) {
+      (browser_shutdown::IsTryingToQuit() ||
+       !KeepAliveRegistry::GetInstance()->IsKeepingAlive())) {
     // Tell everyone that we are shutting down.
     browser_shutdown::SetTryingToQuit(true);
 
 #if defined(ENABLE_SESSION_SERVICE)
     // If ShuttingDownWithoutClosingBrowsers() returns true, the session
     // services may not get a chance to shut down normally, so explicitly shut
     // them down here to ensure they have a chance to persist their data.
     ProfileManager::ShutdownSessionServices();
 #endif
 
@@ skipping 141 matching lines @@
 #if defined(OS_WIN)
   base::win::SetShouldCrashOnProcessDetach(false);
 #endif
   // On Windows 7 and later, the system will consider the process ripe for
   // termination as soon as it hides or destroys its windows. Since any
   // execution past that point will be non-deterministically cut short, we
   // might as well put ourselves out of that misery deterministically.
   base::Process::Current().Terminate(0, false);
 }
 
-void IncrementKeepAliveCount() {
-  // Increment the browser process refcount as long as we're keeping the

[dgn, 2016/03/09 23:49:23]

moved to KeepAliveRegistry::OnKeepingAliveChanged

-  // application alive.
-  if (!WillKeepAlive())
-    g_browser_process->AddRefModule();
-  ++g_keep_alive_count;
-}
-
 void CloseAllBrowsersIfNeeded() {
-  // 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 or explicitly disabled).
   if (chrome::GetTotalBrowserCount() == 0 &&
       !browser_shutdown::IsTryingToQuit() && base::MessageLoop::current() &&
       !g_disable_shutdown_for_testing) {
     CloseAllBrowsers();
   }
 }
 
-void DecrementKeepAliveCount() {
-  DCHECK_GT(g_keep_alive_count, 0);
-  --g_keep_alive_count;
-  // Although we should have a browser process, if there is none,

[dgn, 2016/03/09 23:49:23]

moved to KeepAliveRegistry::OnKeepingAliveChanged

-  // there is nothing to do.
-  if (!g_browser_process) return;
-
-  // Allow the app to shutdown again.
-  if (!WillKeepAlive()) {
-    g_browser_process->ReleaseModule();
-    CloseAllBrowsersIfNeeded();
-  }
-}
-
-int GetKeepAliveCountForTesting() {
-  return g_keep_alive_count;
-}
-
-bool WillKeepAlive() {
-  return g_keep_alive_count > 0;
-}
 #endif  // !defined(OS_ANDROID)
 
 void NotifyAppTerminating() {
   static bool notified = false;
   if (notified)
     return;
   notified = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_APP_TERMINATING,
       content::NotificationService::AllSources(),
@@ skipping 42 matching lines @@
 void OnAppExiting() {
   static bool notified = false;
   if (notified)
     return;
   notified = true;
   HandleAppExitingForPlatform();
 }
 
 void DisableShutdownForTesting(bool disable_shutdown_for_testing) {
   g_disable_shutdown_for_testing = disable_shutdown_for_testing;
-  if (!g_disable_shutdown_for_testing && !WillKeepAlive())
+  if (!g_disable_shutdown_for_testing &&
+      !KeepAliveRegistry::GetInstance()->IsKeepingAlive())
     CloseAllBrowsersIfNeeded();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace chrome