Simplify the handling of crashed extensions.

chrome/browser/ui/webui/options/extension_settings_handler.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/webui/options/extension_settings_handler.h"
 
 #include "base/auto_reset.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 161 matching lines @@
        extension != extensions->end(); ++extension) {
     if (ShouldShowExtension(*extension)) {
       extensions_list->Append(CreateExtensionDetailValue(
           extension_service_,
           *extension,
           GetActivePagesForExtension(*extension),
           warnings,
           false, false));  // enabled, terminated
     }
   }
-  extensions = extension_service_->terminated_extensions();
-  std::vector<ExtensionPage> empty_pages;
-  for (ExtensionSet::const_iterator extension = extensions->begin();
-       extension != extensions->end(); ++extension) {
-    if (ShouldShowExtension(*extension)) {
-      extensions_list->Append(CreateExtensionDetailValue(
-          extension_service_,
-          *extension,
-          empty_pages,  // Terminated process has no active pages.
-          warnings,
-          false, true));  // enabled, terminated
-    }
-  }
   results.Set("extensions", extensions_list);
 
   Profile* profile = Profile::FromWebUI(web_ui());
   bool developer_mode =
       profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
   results.SetBoolean("developerMode", developer_mode);
 
   web_ui()->CallJavascriptFunction("ExtensionSettings.returnExtensionsData",
                                    results);
 
@@ skipping 155 matching lines @@
 
   extension_service_->SetAllowFileAccess(extension, allow_str == "true");
 }
 
 void ExtensionSettingsHandler::HandleUninstallMessage(const ListValue* args) {
   std::string extension_id = UTF16ToUTF8(ExtractStringValue(args));
   CHECK(!extension_id.empty());
   const Extension* extension =
       extension_service_->GetExtensionById(extension_id, true);
   if (!extension)
-    extension = extension_service_->GetTerminatedExtension(extension_id);
-  if (!extension)
     return;
 
   if (!Extension::UserMayDisable(extension->location())) {
     LOG(ERROR) << "Attempt to uninstall an extension that is non-usermanagable "
                << "was made. Extension id : " << extension->id();
     return;
   }
 
   if (!extension_id_prompting_.empty())
     return;  // Only one prompt at a time.
 
   extension_id_prompting_ = extension_id;
 
   GetExtensionUninstallDialog()->ConfirmUninstall(extension);
 }
 
 void ExtensionSettingsHandler::ExtensionUninstallAccepted() {
   DCHECK(!extension_id_prompting_.empty());
 
-  bool was_terminated = false;
-
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   const Extension* extension =
       extension_service_->GetExtensionById(extension_id_prompting_, true);
-  if (!extension) {
-    extension = extension_service_->GetTerminatedExtension(
-        extension_id_prompting_);
-    was_terminated = true;
-  }
   if (!extension)
     return;
 
   extension_service_->UninstallExtension(extension_id_prompting_,
                                          false,  // External uninstall.
                                          NULL);  // Error.
   extension_id_prompting_ = "";
-
-  // There will be no EXTENSION_UNLOADED notification for terminated
-  // extensions as they were already unloaded.
-  if (was_terminated)
-    HandleRequestExtensionsData(NULL);
 }
 
 void ExtensionSettingsHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }
 
 void ExtensionSettingsHandler::HandleOptionsMessage(const ListValue* args) {
   const Extension* extension = GetExtension(args);
   if (!extension || extension->options_url().is_empty())
     return;
@@ skipping 214 matching lines @@
 }
 
 void ExtensionSettingsHandler::MaybeUpdateAfterNotification() {
   WebContents* contents = web_ui()->GetWebContents();
   if (!ignore_notifications_ && contents && contents->GetRenderViewHost())
     HandleRequestExtensionsData(NULL);
   deleting_rvh_ = NULL;
 }
 
 // Static
+// TODO(aa): Remove |terminated| param. Doesn't seem to be in use.
 DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
     ExtensionService* service, const Extension* extension,
     const std::vector<ExtensionPage>& pages,
     const ExtensionWarningSet* warnings_set,
     bool enabled, bool terminated) {
   DictionaryValue* extension_data = new DictionaryValue();
   GURL icon =
       ExtensionIconSource::GetIconURL(extension,
                                       Extension::EXTENSION_ICON_MEDIUM,
                                       ExtensionIconSet::MATCH_BIGGER,
@@ skipping 114 matching lines @@
         chrome::VIEW_TYPE_EXTENSION_DIALOG == host_type)
       continue;
 
     GURL url = host->delegate()->GetURL();
     content::RenderProcessHost* process = host->process();
     result->push_back(
         ExtensionPage(url, process->GetID(), host->routing_id(),
                       process->GetBrowserContext()->IsOffTheRecord()));
   }
 }