Rename Start/EndKeepAlive to Increment/DecrementKeepAliveCount

chrome/browser/background/background_mode_manager.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 189 matching lines @@
         base::Bind(&BackgroundModeManager::OnBackgroundModeEnabledPrefChanged,
                    base::Unretained(this)));
   }
 
   // Keep the browser alive until extensions are done loading - this is needed
   // by the --no-startup-window flag. We want to stay alive until we load
   // extensions, at which point we should either run in background mode (if
   // there are background apps) or exit if there are none.
   if (command_line->HasSwitch(switches::kNoStartupWindow)) {
     keep_alive_for_startup_ = true;
-    chrome::StartKeepAlive();
+    chrome::IncrementKeepAliveCount();
   } else {
     // Otherwise, start with background mode suspended in case we're launching
     // in a mode that doesn't open a browser window. It will be resumed when the
     // first browser window is opened.
     SuspendBackgroundMode();
   }
 
   // If the -keep-alive-for-test flag is passed, then always keep chrome running
   // in the background until the user explicitly terminates it.
   if (command_line->HasSwitch(switches::kKeepAliveForTest))
@@ skipping 93 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, content::NotificationObserver overrides
 void BackgroundModeManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSIONS_READY:
       // Extensions are loaded, so we don't need to manually keep the browser
       // process alive any more when running in no-startup-window mode.
-      EndKeepAliveForStartup();
+      DecrementKeepAliveCountForStartup();
       break;
 
     case chrome::NOTIFICATION_EXTENSION_LOADED: {
         Extension* extension = content::Details<Extension>(details).ptr();
         Profile* profile = content::Source<Profile>(source).ptr();
         if (BackgroundApplicationListModel::IsBackgroundApp(
                 *extension, profile)) {
           // Extensions loaded after the ExtensionsService is ready should be
           // treated as new installs.
           if (extensions::ExtensionSystem::Get(profile)->extension_service()->
@@ skipping 15 matching lines @@
                 extensions::APIPermission::kBackground) &&
             info->reason == UpdatedExtensionPermissionsInfo::ADDED) {
           // Turned on background permission, so treat this as a new install.
           OnBackgroundAppInstalled(info->extension);
         }
       }
       break;
     case chrome::NOTIFICATION_APP_TERMINATING:
       // Make sure we aren't still keeping the app alive (only happens if we
       // don't receive an EXTENSIONS_READY notification for some reason).
-      EndKeepAliveForStartup();
+      DecrementKeepAliveCountForStartup();
       // Performing an explicit shutdown, so exit background mode (does nothing
       // if we aren't in background mode currently).
       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();
       for (BackgroundModeInfoMap::iterator it =
                background_mode_data_.begin();
            it != background_mode_data_.end();
            ++it) {
@@ skipping 144 matching lines @@
     }
     default:
       bmd->ExecuteCommand(command_id, event_flags);
       break;
   }
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, private
-void BackgroundModeManager::EndKeepAliveForStartup() {
+void BackgroundModeManager::DecrementKeepAliveCountForStartup() {
   if (keep_alive_for_startup_) {
     keep_alive_for_startup_ = false;
     // We call this via the message queue to make sure we don't try to end
     // keep-alive (which can shutdown Chrome) before the message loop has
     // started.
-    base::MessageLoop::current()->PostTask(FROM_HERE,
-                                           base::Bind(&chrome::EndKeepAlive));
+    base::MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(&chrome::DecrementKeepAliveCount));
   }
 }
 
 void BackgroundModeManager::StartBackgroundMode() {
   DCHECK(ShouldBeInBackgroundMode());
   // Don't bother putting ourselves in background mode if we're already there
   // or if background mode is disabled.
   if (in_background_mode_)
     return;
 
@@ skipping 46 matching lines @@
 
 void BackgroundModeManager::ResumeBackgroundMode() {
   background_mode_suspended_ = false;
   UpdateKeepAliveAndTrayIcon();
 }
 
 void BackgroundModeManager::UpdateKeepAliveAndTrayIcon() {
   if (in_background_mode_ && !background_mode_suspended_) {
     if (!keeping_alive_) {
       keeping_alive_ = true;
-      chrome::StartKeepAlive();
+      chrome::IncrementKeepAliveCount();
     }
     CreateStatusTrayIcon();
     return;
   }
 
   RemoveStatusTrayIcon();
   if (keeping_alive_) {
     keeping_alive_ = false;
-    chrome::EndKeepAlive();
+    chrome::DecrementKeepAliveCount();
   }
 }
 
 void BackgroundModeManager::OnBrowserAdded(Browser* browser) {
   ResumeBackgroundMode();
 }
 
 int BackgroundModeManager::GetBackgroundAppCount() const {
   int count = 0;
   // Walk the BackgroundModeData for all profiles and count the number of apps.
@@ skipping 196 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }