Graceful handling of extension process crashes

chrome/browser/task_manager_resource_providers.cc

 // Copyright (c) 2006-2008 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/task_manager_resource_providers.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
@@ skipping 522 matching lines @@
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   for (ProfileManager::const_iterator it = profile_manager->begin();
        it != profile_manager->end(); ++it) {
       ExtensionProcessManager* process_manager =
           (*it)->GetExtensionProcessManager();
       ExtensionProcessManager::const_iterator jt;
       for (jt = process_manager->begin(); jt != process_manager->end(); ++jt)
         AddToTaskManager(*jt);
   }
 
-  // Register for notifications to get new extension processes.
+  // Register for notifications about extension process changes.
   registrar_.Add(this, NotificationType::EXTENSION_HOST_CREATED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_HOST_DESTROYED,
                  NotificationService::AllSources());
+  registrar_.Add(this, NotificationType::EXTENSION_PROCESS_CRASHED,
+                 NotificationService::AllSources());
+  registrar_.Add(this, NotificationType::EXTENSION_PROCESS_RESTORED,
+                 NotificationService::AllSources());
 }
 
 void TaskManagerExtensionProcessResourceProvider::StopUpdating() {
   DCHECK(updating_);
   updating_ = false;
 
-  // Unregister for notifications to get new extension processes.
+  // Unregister for notifications about extension process changes.
   registrar_.Remove(this, NotificationType::EXTENSION_HOST_CREATED,
                     NotificationService::AllSources());
   registrar_.Remove(this, NotificationType::EXTENSION_HOST_DESTROYED,
                     NotificationService::AllSources());
+  registrar_.Remove(this, NotificationType::EXTENSION_PROCESS_CRASHED,
+                    NotificationService::AllSources());
+  registrar_.Remove(this, NotificationType::EXTENSION_PROCESS_RESTORED,
+                    NotificationService::AllSources());
 
   // Delete all the resources.
   STLDeleteContainerPairSecondPointers(resources_.begin(), resources_.end());
 
   resources_.clear();
   pid_to_resources_.clear();
 }
 
 void TaskManagerExtensionProcessResourceProvider::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_HOST_CREATED:
+    case NotificationType::EXTENSION_PROCESS_RESTORED:
       AddToTaskManager(Details<ExtensionHost>(details).ptr());
       break;
     case NotificationType::EXTENSION_HOST_DESTROYED:
+    case NotificationType::EXTENSION_PROCESS_CRASHED:
       RemoveFromTaskManager(Details<ExtensionHost>(details).ptr());
       break;
     default:
       NOTREACHED() << "Unexpected notification.";
       return;
   }
 }
 
 void TaskManagerExtensionProcessResourceProvider::AddToTaskManager(
     ExtensionHost* extension_host) {
+  // Don't add dead extension processes.
+  if (!extension_host->IsViewLive())
+    return;
+
   TaskManagerExtensionProcessResource* resource =
       new TaskManagerExtensionProcessResource(extension_host);
   DCHECK(resources_.find(extension_host) == resources_.end());
   resources_[extension_host] = resource;
   pid_to_resources_[resource->process_id()] = resource;
   task_manager_->AddResource(resource);
 }
 
 void TaskManagerExtensionProcessResourceProvider::RemoveFromTaskManager(
     ExtensionHost* extension_host) {
@@ skipping 97 matching lines @@
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }