BackgroudModeManager now listens for APP_TERMINATING and shuts down background

chrome/browser/background_mode_manager.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/background_mode_manager.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 17 matching lines @@
       background_app_count_(0),
       status_tray_(NULL),
       status_icon_(NULL) {
   // If background mode is disabled for unittests, just exit - don't listen for
   // any notifications.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableBackgroundMode))
     return;
 
   // If the -keep-alive-for-test flag is passed, then always keep chrome running
-  // in the background until the user explicitly terminates it.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kKeepAliveForTest)) {
-    StartBackgroundMode();
-    registrar_.Add(this, NotificationType::APP_TERMINATING,
-                 NotificationService::AllSources());
-  }
+  // in the background until the user explicitly terminates it, by acting as if
+  // we loaded a background app.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest))
+    OnBackgroundAppLoaded();
 
   // When an extension is installed, make sure launch on startup is properly
   // set if appropriate. Likewise, turn off launch on startup when the last
   // background app is uninstalled.
   registrar_.Add(this, NotificationType::EXTENSION_INSTALLED,
                  Source<Profile>(profile));
   registrar_.Add(this, NotificationType::EXTENSION_UNINSTALLED,
                  Source<Profile>(profile));
   // Listen for when extensions are loaded/unloaded so we can track the
   // number of background apps.
   registrar_.Add(this, NotificationType::EXTENSION_LOADED,
                  Source<Profile>(profile));
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  Source<Profile>(profile));
 
   // Check for the presence of background apps after all extensions have been
   // loaded, to handle the case where an extension has been manually removed
   // while Chrome was not running.
   registrar_.Add(this, NotificationType::EXTENSIONS_READY,
                  Source<Profile>(profile));
 
+  // Listen for the application shutting down so we can decrement our KeepAlive
+  // count.
+  registrar_.Add(this, NotificationType::APP_TERMINATING,
+                 NotificationService::AllSources());
+
+
 }
 
 BackgroundModeManager::~BackgroundModeManager() {
   // If we're going away, remove our status tray icon so we don't get any events
   // from it.
   RemoveStatusTrayIcon();
 }
 
 bool BackgroundModeManager::IsBackgroundModeEnabled() {
   return profile_->GetPrefs()->GetBoolean(prefs::kBackgroundModeEnabled);
@@ skipping 17 matching lines @@
       break;
     case NotificationType::EXTENSION_INSTALLED:
       if (IsBackgroundApp(Details<Extension>(details).ptr()))
         OnBackgroundAppInstalled();
       break;
     case NotificationType::EXTENSION_UNINSTALLED:
       if (IsBackgroundApp(Details<Extension>(details).ptr()))
         OnBackgroundAppUninstalled();
       break;
     case NotificationType::APP_TERMINATING:
-      // Performing an explicit shutdown, so allow the browser process to exit.
-      // (we only listen for this notification if the keep-alive-for-test flag
-      // is passed).
-      DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kKeepAliveForTest));
-      EndBackgroundMode();
+      // Performing an explicit shutdown, so exit background mode if we were in
+      // background mode.
+      if (background_app_count_ > 0 && IsBackgroundModeEnabled())
+        EndBackgroundMode();
+      // Shutting down, so don't listen for any more notifications so we don't
+      // try to re-enter/exit background mode again.
+      registrar_.RemoveAll();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 bool BackgroundModeManager::IsBackgroundApp(Extension* extension) {
   return extension->HasApiPermission(Extension::kBackgroundPermission);
 }
@@ skipping 121 matching lines @@
     default:
       NOTREACHED();
       break;
   }
 }
 
 // static
 void BackgroundModeManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
 }