Add KeepAliveStateObserver, add the Restart option

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 293 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_.reset(
-        new ScopedKeepAlive(KeepAliveOrigin::BACKGROUND_MODE_MANAGER));
+        new ScopedKeepAlive(KeepAliveOrigin::BACKGROUND_MODE_MANAGER_STARTUP,
+                            KeepAliveRestartOption::DISABLED));
   } 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 435 matching lines @@
 
 void BackgroundModeManager::ResumeBackgroundMode() {
   background_mode_suspended_ = false;
   UpdateKeepAliveAndTrayIcon();
 }
 
 void BackgroundModeManager::UpdateKeepAliveAndTrayIcon() {
   if (in_background_mode_ && !background_mode_suspended_) {
     if (!keep_alive_) {
       keep_alive_.reset(
-          new ScopedKeepAlive(KeepAliveOrigin::BACKGROUND_MODE_MANAGER));
+          new ScopedKeepAlive(KeepAliveOrigin::BACKGROUND_MODE_MANAGER,
+                              KeepAliveRestartOption::ENABLED));
     }
     CreateStatusTrayIcon();
     return;
   }
 
   RemoveStatusTrayIcon();
   keep_alive_.reset();
 }
 
 void BackgroundModeManager::OnBrowserAdded(Browser* browser) {
@@ skipping 246 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }