When restoring kiosk app after crash, skip app installation steps. Installed apps should already be…

chrome/browser/chromeos/app_mode/startup_app_launcher.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/startup_app_launcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 78 matching lines @@
       ->RemoveObserver(this);
   extensions::InstallTrackerFactory::GetForBrowserContext(profile_)
       ->RemoveObserver(this);
 }
 
 void StartupAppLauncher::Initialize() {
   StartLoadingOAuthFile();
 }
 
 void StartupAppLauncher::ContinueWithNetworkReady() {
-  if (!network_ready_handled_) {
-    network_ready_handled_ = true;
-    // The network might not be ready when KioskAppManager tries to update
-    // external cache initially. Update the external cache now that the network
-    // is ready for sure.
-    wait_for_crx_update_ = true;
-    KioskAppManager::Get()->UpdateExternalCache();
+  if (network_ready_handled_)
+    return;
+
+  network_ready_handled_ = true;
+
+  if (delegate_->ShouldSkipAppInstallation()) {
+    MaybeLaunchApp();
+    return;
   }
+
+  // The network might not be ready when KioskAppManager tries to update
+  // external cache initially. Update the external cache now that the network
+  // is ready for sure.
+  wait_for_crx_update_ = true;
+  KioskAppManager::Get()->UpdateExternalCache();
 }
 
 void StartupAppLauncher::StartLoadingOAuthFile() {
   delegate_->OnLoadingOAuthFile();
 
   KioskOAuthParams* auth_params = new KioskOAuthParams();
   BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
       base::Bind(&StartupAppLauncher::LoadOAuthFileOnBlockingPool,
                  auth_params),
@@ skipping 64 matching lines @@
   const bool requires_network =
       (!extension && !crx_cached) ||
       (extension &&
        !extensions::OfflineEnabledInfo::IsOfflineEnabled(extension));
 
   if (requires_network) {
     delegate_->InitializeNetwork();
     return;
   }
 
+  if (delegate_->ShouldSkipAppInstallation()) {
+    MaybeLaunchApp();
+    return;
+  }
+
   // Update the offline enabled crx cache if the network is ready;
   // or just install the app.
   if (delegate_->IsNetworkReady())
     ContinueWithNetworkReady();
   else
     BeginInstall();
 }
 
 void StartupAppLauncher::InitializeTokenService() {
   delegate_->OnInitializingTokenService();
@@ skipping 35 matching lines @@
   MaybeInitializeNetwork();
 }
 
 void StartupAppLauncher::OnRefreshTokensLoaded() {
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)
       ->RemoveObserver(this);
   MaybeInitializeNetwork();
 }
 
 void StartupAppLauncher::MaybeLaunchApp() {
-  // Check if the app is offline enabled.
   const Extension* extension = GetPrimaryAppExtension();
-  DCHECK(extension);
+  // Verify that requred apps are installed. While the apps should be
+  // present at this point, crash recovery flow skips app installation steps -
+  // this means that the kiosk app might not yet be downloaded. If that is
+  // the case, bail out from the app launch.
+  if (!extension || !AreSecondaryAppsInstalled()) {
+    OnLaunchFailure(KioskAppLaunchError::UNABLE_TO_LAUNCH);
+    return;
+  }
+
   const bool offline_enabled =
       extensions::OfflineEnabledInfo::IsOfflineEnabled(extension);
+  // If the app is not offline enabled, make sure the network is ready before
+  // launching.
   if (offline_enabled || delegate_->IsNetworkReady()) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&StartupAppLauncher::OnReadyToLaunch, AsWeakPtr()));
   } else {
     ++launch_attempt_;
     if (launch_attempt_ < kMaxLaunchAttempt) {
       BrowserThread::PostTask(
           BrowserThread::UI,
@@ skipping 310 matching lines @@
   // Skip copying meta data from the current installed primary app when
   // there is a pending update.
   if (PrimaryAppHasPendingUpdate())
     return;
 
   KioskAppManager::Get()->ClearAppData(app_id_);
   KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);
 }
 
 }   // namespace chromeos