Cleanup: Pull some browser keep alive functions into its own file.

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 "chrome/browser/background/background_mode_manager.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_application_list_model.h"
 #include "chrome/browser/background/background_trigger.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/browser_keep_alive.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 73 matching lines @@
   MENU_ITEM_BACKGROUND_CLIENT = 2,
   MENU_ITEM_KEEP_RUNNING = 3,
   MENU_ITEM_EXIT = 4,
   MENU_ITEM_NUM_STATES
 };
 
 void RecordMenuItemClick(MenuItem item) {
   UMA_HISTOGRAM_ENUMERATION("BackgroundMode.MenuItemClick", item,
                             MENU_ITEM_NUM_STATES);
 }
+
+// Helper function for DecrementKeepAliveCountForStartup() to actually decrement
+// the keep alive.
+void DoDecrementKeepAliveCountForStartup(
+    scoped_ptr<browser_lifetime::ScopedKeepAlive> keep_alive) {
+  keep_alive.reset();  // Explicitly reset().

[sky, 2015/10/07 17:27:24]

You don't actually need this.

+}
+
 }  // namespace
 
 BackgroundModeManager::BackgroundModeData::BackgroundModeData(
     Profile* profile,
     CommandIdHandlerVector* command_id_handler_vector)
     : applications_(new BackgroundApplicationListModel(profile)),
       profile_(profile),
       command_id_handler_vector_(command_id_handler_vector) {
 }
 
@@ skipping 169 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, public
 BackgroundModeManager::BackgroundModeManager(
     const base::CommandLine& command_line,
     ProfileInfoCache* profile_cache)
     : profile_cache_(profile_cache),
       status_tray_(NULL),
       status_icon_(NULL),
       context_menu_(NULL),
       in_background_mode_(false),
-      keep_alive_for_startup_(false),
       keep_alive_for_test_(false),
       background_mode_suspended_(false),
-      keeping_alive_(false),
       weak_factory_(this) {
   // We should never start up if there is no browser process or if we are
   // currently quitting.
   CHECK(g_browser_process != NULL);
   CHECK(!browser_shutdown::IsTryingToQuit());
 
   // Add self as an observer for the profile info cache so we know when profiles
   // are deleted and their names change.
   profile_cache_->AddObserver(this);
 
   RecordAutoLaunchState(command_line);
   UMA_HISTOGRAM_BOOLEAN("BackgroundMode.OnStartup.IsBackgroundModePrefEnabled",
                         IsBackgroundModePrefEnabled());
 
   // Listen for the background mode preference changing.
   if (g_browser_process->local_state()) {  // Skip for unit tests
     pref_registrar_.Init(g_browser_process->local_state());
     pref_registrar_.Add(
         prefs::kBackgroundModeEnabled,
         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::IncrementKeepAliveCount();
+    keep_alive_for_startup_.reset(new browser_lifetime::ScopedKeepAlive);
   } 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 316 matching lines @@
       browser_watcher::ExitFunnel::RecordSingleEvent(
             chrome::kBrowserExitCodesRegistryPath, L"TraybarExit");
 #endif
       content::RecordAction(UserMetricsAction("Exit"));
       chrome::CloseAllBrowsers();
       break;
     case IDC_STATUS_TRAY_KEEP_CHROME_RUNNING_IN_BACKGROUND: {
       // Background mode must already be enabled (as otherwise this menu would
       // not be visible).
       DCHECK(IsBackgroundModePrefEnabled());
-      DCHECK(chrome::WillKeepAlive());
+      DCHECK(browser_lifetime::WillKeepAlive());
 
       RecordMenuItemClick(MENU_ITEM_KEEP_RUNNING);
 
       // Set the background mode pref to "disabled" - the resulting notification
       // will result in a call to DisableBackgroundMode().
       PrefService* service = g_browser_process->local_state();
       DCHECK(service);
       service->SetBoolean(prefs::kBackgroundModeEnabled, false);
       break;
     }
     default:
       if (bmd) {
         bmd->ExecuteCommand(command_id, event_flags);
       } else {
         UserManager::Show(base::FilePath(),
                           profiles::USER_MANAGER_NO_TUTORIAL,
                           profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
       }
       break;
   }
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, private
 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::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&chrome::DecrementKeepAliveCount));
+        FROM_HERE,
+        base::Bind(&DoDecrementKeepAliveCountForStartup,
+                   base::Passed(&keep_alive_for_startup_)));
   }
 }
 
 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 58 matching lines @@
   UpdateKeepAliveAndTrayIcon();
 }
 
 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::IncrementKeepAliveCount();
+    if (!keep_alive_for_background_mode_) {
+      keep_alive_for_background_mode_.reset(
+          new browser_lifetime::ScopedKeepAlive);
 
 #if defined(OS_WIN)
       browser_watcher::ExitFunnel::RecordSingleEvent(
             chrome::kBrowserExitCodesRegistryPath, L"BackgroundOn");
 #endif
     }
     CreateStatusTrayIcon();
     return;
   }
 
   RemoveStatusTrayIcon();
-  if (keeping_alive_) {
-    keeping_alive_ = false;
-    chrome::DecrementKeepAliveCount();
+  if (keep_alive_for_background_mode_) {
+    keep_alive_for_background_mode_.reset();
 
 #if defined(OS_WIN)
     browser_watcher::ExitFunnel::RecordSingleEvent(
           chrome::kBrowserExitCodesRegistryPath, L"BackgroundOff");
 #endif
   }
 }
 
 void BackgroundModeManager::OnBrowserAdded(Browser* browser) {
   ResumeBackgroundMode();
@@ skipping 38 matching lines @@
       OnBackgroundClientInstalled(name);
   }
 }
 
 int BackgroundModeManager::GetBackgroundClientCount() const {
   int count = 0;
   // Walk the BackgroundModeData for all profiles and count the number of
   // clients.
   for (const auto& it : background_mode_data_)
     count += it.second->GetBackgroundClientCount();
-  DCHECK(count >= 0);
+  DCHECK_GE(count, 0);
   return count;
 }
 
 int BackgroundModeManager::GetBackgroundClientCountForProfile(
     Profile* const profile) const {
   BackgroundModeManager::BackgroundModeData* bmd =
       GetBackgroundModeData(profile);
   if (!bmd)
     return 0;
   return bmd->GetBackgroundClientCount();
@@ skipping 162 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }