Add ScopedKeepAlive to c/b/lifetime

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 <stddef.h>
 #include <algorithm>
 #include <string>
 #include <utility>
@@ skipping 260 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, public
 BackgroundModeManager::BackgroundModeManager(
     const base::CommandLine& command_line,
     ProfileAttributesStorage* profile_storage)
     : profile_storage_(profile_storage),
       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 ProfileAttributesStorage so we know when
   // profiles are deleted and their names change.
   profile_storage_->AddObserver(this);
 
   UMA_HISTOGRAM_BOOLEAN("BackgroundMode.OnStartup.AutoLaunchState",
                         command_line.HasSwitch(switches::kNoStartupWindow));
   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 ScopedKeepAlive("BackgroundForStartup"));
   } 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 342 matching lines @@
                           profiles::USER_MANAGER_NO_TUTORIAL,
                           profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
       }
       break;
   }
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, private
+void BackgroundModeManager::ReleaseStartupKeepAlive() {
+  keep_alive_for_startup_.reset();
+}
+
 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(&BackgroundModeManager::ReleaseStartupKeepAlive,
+                              base::Unretained(this)));
   }
 }
 
 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_)
+      keep_alive_.reset(new ScopedKeepAlive(

[Bernhard Bauer, 2016/02/19 17:39:28]

Nit: braces

[dgn, 2016/02/19 18:04:28]

Done.

+          "Background", OptimizationOptions::RESTART_ALLOWED));
     CreateStatusTrayIcon();
     return;
   }
 
   RemoveStatusTrayIcon();
-  if (keeping_alive_) {
-    keeping_alive_ = false;
-    chrome::DecrementKeepAliveCount();
-  }
+  if (keep_alive_)
+    keep_alive_.reset();

[Bernhard Bauer, 2016/02/19 17:39:28]

You can unconditionally reset it; it will be a no-op if it was previously null.

[dgn, 2016/02/19 18:04:28]

Done.

 }
 
 void BackgroundModeManager::OnBrowserAdded(Browser* browser) {
   ResumeBackgroundMode();
 }
 
 void BackgroundModeManager::OnClientsChanged(
     Profile* profile,
     const std::vector<base::string16>& new_client_names) {
   DCHECK(IsBackgroundModePrefEnabled());
@@ skipping 239 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }