Replace BrowserProces::AddRefModule/RemoveModule by ScopedKeepAlive

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"
@@ skipping 90 matching lines @@
 
   g_browser_process->platform_part()->AttemptExit();
 }
 
 #if !defined(OS_ANDROID)
 void CloseAllBrowsersAndQuit() {
   browser_shutdown::SetTryingToQuit(true);
   CloseAllBrowsers();
 }
 
+void ShutdownIfNoBrowsers() {
+  if (chrome::GetTotalBrowserCount() > 0)
+    return;
+
+  // 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
+
+  chrome::NotifyAndTerminate(true);
+  chrome::OnAppExiting();
+}
+
 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() ||
        !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
-
-    chrome::NotifyAndTerminate(true);
-    chrome::OnAppExiting();
+    ShutdownIfNoBrowsers();
     return;
   }
 
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesRecorder::Get()->AddLogoutTimeMarker(
       "StartedClosingWindows", false);
 #endif
   scoped_refptr<BrowserCloseManager> browser_close_manager =
       new BrowserCloseManager;
   browser_close_manager->StartClosingBrowsers();
@@ skipping 129 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 CloseAllBrowsersIfNeeded() {
-  if (chrome::GetTotalBrowserCount() == 0 &&
-      !browser_shutdown::IsTryingToQuit() && base::MessageLoop::current() &&
-      !g_disable_shutdown_for_testing) {
-    CloseAllBrowsers();
-  }
+void ShutdownIfNeeded() {
+  if (g_disable_shutdown_for_testing)
+    return;
+
+  // We are already in the process of shutting down, no need to renotify.
+  if (browser_shutdown::IsTryingToQuit())
+    return;
+
+  ShutdownIfNoBrowsers();

[dgn, 2016/03/16 15:10:50]

Moved the method out of CloseAllBrowsers to make what we want to do clearer.

- GetTotalBrowserCount() gets checked in ShutdownIfNoBrowsers, and we only call
this when IsKeepingAlive is false anyway, which implies no browsers.
- g_disable_shutdown_for_testing gets now set for all unit tests, allowing to
skip the message loop check (which wasn't covering all unit tests in the first
place)

 }
 
 #endif  // !defined(OS_ANDROID)
 
 void NotifyAppTerminating() {
   static bool notified = false;
   if (notified)
     return;
   notified = true;
   content::NotificationService::current()->Notify(
@@ skipping 44 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 &&
-      !KeepAliveRegistry::GetInstance()->IsKeepingAlive())
-    CloseAllBrowsersIfNeeded();
+
+  if (!KeepAliveRegistry::GetInstance()->IsKeepingAlive())
+    ShutdownIfNeeded();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace chrome