Fire notifications when reboot is requested, not scheduled

chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc

 // Copyright 2013 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/chromeos/app_mode/kiosk_app_update_service.h"
 
 #include "base/logging.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
@@ skipping 16 matching lines @@
 // How low to wait after an update is available before we force a restart.
 const int kForceRestartWaitTimeMs = 24 * 3600 * 1000;  // 24 hours.
 
 }  // namespace
 
 KioskAppUpdateService::KioskAppUpdateService(
     Profile* profile,
     system::AutomaticRebootManager* automatic_reboot_manager)
     : profile_(profile),
       automatic_reboot_manager_(automatic_reboot_manager) {
+}
+
+KioskAppUpdateService::~KioskAppUpdateService() {
+}
+
+void KioskAppUpdateService::Init(const std::string& app_id) {
+  DCHECK(app_id_.empty());
+  app_id_ = app_id;
+
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (service)
     service->AddUpdateObserver(this);
 
   if (automatic_reboot_manager_)
     automatic_reboot_manager_->AddObserver(this);
 
   if (KioskAppManager::Get())
     KioskAppManager::Get()->AddObserver(this);
-}
 
-KioskAppUpdateService::~KioskAppUpdateService() {
+  if (automatic_reboot_manager_->reboot_requested())
+    OnRebootRequested(automatic_reboot_manager_->reboot_reason());
 }
 
 void KioskAppUpdateService::StartAppUpdateRestartTimer() {
   if (restart_timer_.IsRunning())
     return;
 
   // Setup timer to force restart once the wait period expires.
   restart_timer_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(kForceRestartWaitTimeMs),
       this, &KioskAppUpdateService::ForceAppUpdateRestart);
 }
 
 void KioskAppUpdateService::ForceAppUpdateRestart() {
   // Force a chrome restart (not a logout or reboot) by closing all browsers.
   LOG(WARNING) << "Force closing all browsers to update kiosk app.";
   chrome::CloseAllBrowsersAndQuit();
 }
 
 void KioskAppUpdateService::Shutdown() {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (service)
     service->RemoveUpdateObserver(this);
   if (KioskAppManager::Get())
     KioskAppManager::Get()->RemoveObserver(this);
 }

[xiyuan, 2014/11/17 20:08:03]

nit: unrelated to this CL but would you mind add 

if (automatic_reboot_manager_)
  automatic_reboot_manager_->RemoveObserver(this);

here?

[bartfab (slow), 2014/11/18 11:04:46]

Done.

 
 void KioskAppUpdateService::OnAppUpdateAvailable(
     const extensions::Extension* extension) {
   if (extension->id() != app_id_)
     return;
 
   // Clears cached app data so that it will be reloaded if update from app
   // does not finish in this run.
   KioskAppManager::Get()->ClearAppData(app_id_);
   KioskAppManager::Get()->UpdateAppDataFromProfile(
       app_id_, profile_, extension);
 
   extensions::RuntimeEventRouter::DispatchOnRestartRequiredEvent(
       profile_,
       app_id_,
       extensions::core_api::runtime::OnRestartRequired::REASON_APP_UPDATE);
 
   StartAppUpdateRestartTimer();
 }
 
-void KioskAppUpdateService::OnRebootScheduled(Reason reason) {
+void KioskAppUpdateService::OnRebootRequested(Reason reason) {
   extensions::core_api::runtime::OnRestartRequired::Reason restart_reason =
       extensions::core_api::runtime::OnRestartRequired::REASON_NONE;
   switch (reason) {
     case REBOOT_REASON_OS_UPDATE:
       restart_reason =
           extensions::core_api::runtime::OnRestartRequired::REASON_OS_UPDATE;
       break;
     case REBOOT_REASON_PERIODIC:
       restart_reason =
           extensions::core_api::runtime::OnRestartRequired::REASON_PERIODIC;
       break;
     default:
       NOTREACHED() << "Unknown reboot reason=" << reason;
       return;
   }
 
   extensions::RuntimeEventRouter::DispatchOnRestartRequiredEvent(
       profile_, app_id_, restart_reason);
 }
 
 void KioskAppUpdateService::WillDestroyAutomaticRebootManager() {
-  automatic_reboot_manager_->RemoveObserver(this);
   automatic_reboot_manager_ = NULL;
 }
 
 void KioskAppUpdateService::OnKioskAppCacheUpdated(const std::string& app_id) {
   if (app_id != app_id_)
     return;
 
   extensions::RuntimeEventRouter::DispatchOnRestartRequiredEvent(
       profile_,
       app_id_,
@@ skipping 31 matching lines @@
 }
 
 KeyedService* KioskAppUpdateServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   return new KioskAppUpdateService(
       Profile::FromBrowserContext(context),
       g_browser_process->platform_part()->automatic_reboot_manager());
 }
 
 }  // namespace chromeos