Fire notifications when reboot is requested, not scheduled

chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc

Index: chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
index ea96dd648c7617533ffbaa5b71cc9c453eac2aac..41c079ed1209f5eed0837c3bc21894b4059d6b88 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
@@ -34,6 +34,15 @@ KioskAppUpdateService::KioskAppUpdateService(
     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)
@@ -44,9 +53,9 @@ KioskAppUpdateService::KioskAppUpdateService(
 
   if (KioskAppManager::Get())
     KioskAppManager::Get()->AddObserver(this);
-}
 
-KioskAppUpdateService::~KioskAppUpdateService() {
+  if (automatic_reboot_manager_->reboot_requested())
+    OnRebootRequested(automatic_reboot_manager_->reboot_reason());
 }
 
 void KioskAppUpdateService::StartAppUpdateRestartTimer() {
@@ -93,7 +102,7 @@ void KioskAppUpdateService::OnAppUpdateAvailable(
   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) {
@@ -115,7 +124,6 @@ void KioskAppUpdateService::OnRebootScheduled(Reason reason) {
 }
 
 void KioskAppUpdateService::WillDestroyAutomaticRebootManager() {
-  automatic_reboot_manager_->RemoveObserver(this);
   automatic_reboot_manager_ = NULL;
 }