Merge 244632 "kiosk: Do update check during launch."

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"
+#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 
 namespace chromeos {
@@ skipping 42 matching lines @@
   ExtensionService* service = profile_->GetExtensionService();
   if (service)
     service->RemoveUpdateObserver(this);
 }
 
 void KioskAppUpdateService::OnAppUpdateAvailable(const std::string& app_id) {
   DCHECK(!app_id_.empty());
   if (app_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_);
+
   extensions::RuntimeEventRouter::DispatchOnRestartRequiredEvent(
       profile_,
       app_id_,
       extensions::api::runtime::OnRestartRequired::REASON_APP_UPDATE);
 
   StartAppUpdateRestartTimer();
 }
 
 void KioskAppUpdateService::OnRebootScheduled(Reason reason) {
   extensions::api::runtime::OnRestartRequired::Reason restart_reason =
@@ skipping 50 matching lines @@
 
 BrowserContextKeyedService*
 KioskAppUpdateServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   return new KioskAppUpdateService(
       Profile::FromBrowserContext(context),
       g_browser_process->platform_part()->automatic_reboot_manager());
 }
 
 }  // namespace chromeos