Fix launching crashed apps from the command line while Chrome is running.

chrome/browser/ui/startup/startup_browser_creator_impl.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/ui/startup/startup_browser_creator_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "apps/app_restore_service.h"
@@ skipping 287 matching lines @@
     DCHECK_EQ(type, content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
     contents_ = NULL;
   }
 
   content::WebContents* contents_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsCloseObserver);
 };
 
-const Extension* GetDisabledPlatformApp(Profile* profile,
+const Extension* GetDisabledOrTerminatedPlatformApp(Profile* profile,
                                         const std::string& extension_id) {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   const Extension* extension = service->GetExtensionById(extension_id, true);
+  if (!extension)
+    extension = service->GetTerminatedExtension(extension_id);
   return extension && extension->is_platform_app() ? extension : NULL;
 }
 
 }  // namespace
 
 namespace internals {
 
 GURL GetWelcomePageURL() {
   std::string welcome_url = l10n_util::GetStringUTF8(IDS_WELCOME_PAGE_URL);
   return GURL(welcome_url);
@@ skipping 37 matching lines @@
   if (command_line_.HasSwitch(switches::kDnsLogDetails))
     chrome_browser_net::EnablePredictorDetailedLog(true);
   if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) &&
       profile->GetNetworkPredictor()) {
     profile->GetNetworkPredictor()->EnablePredictor(false);
   }
 
   AppListService::InitAll(profile);
   if (command_line_.HasSwitch(switches::kAppId)) {
     std::string app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
-    const Extension* extension = GetDisabledPlatformApp(profile, app_id);
-    // If |app_id| is a disabled platform app we handle it specially here,
-    // otherwise it will be handled below.
+    const Extension* extension =
+        GetDisabledOrTerminatedPlatformApp(profile, app_id);
+    // If |app_id| is a disabled or terminated platform app we handle it
+    // specially here, otherwise it will be handled below.
     if (extension) {
       RecordCmdLineAppHistogram(extensions::Manifest::TYPE_PLATFORM_APP);
       AppLaunchParams params(profile, extension,
                              extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW);
       params.command_line = command_line_;
       params.current_directory = cur_dir_;
       // If we are being launched from the command line, default to native
       // desktop.
       params.desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
       OpenApplicationWithReenablePrompt(params);
@@ skipping 606 matching lines @@
 }
 
 #if !defined(OS_WIN)
 // static
 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
     Profile* profile,
     const std::vector<GURL>& startup_urls) {
   return false;
 }
 #endif