Simplify the handling of crashed extensions.

chrome/browser/extensions/extension_service.h

Index: chrome/browser/extensions/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 3e105e6ae9c516b1dd9be6673c81ce2cf52cc63e..e845e5f3f749143f9dbc01059e9a55a41787bfca 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -197,10 +197,9 @@ class ExtensionService
   // Gets the list of currently installed extensions.
   virtual const ExtensionSet* extensions() const OVERRIDE;
   const ExtensionSet* disabled_extensions() const;
-  const ExtensionSet* terminated_extensions() const;
 
-  // Retuns a set of all installed, disabled, and terminated extensions and
-  // transfers ownership to caller.
+  // Retuns a set of all installed and disabled extensions, and transfers
+  // ownership to caller.
   const ExtensionSet* GenerateInstalledExtensionsSet() const;
 
   // Gets the object managing the set of pending extensions.
@@ -297,16 +296,12 @@ class ExtensionService
   // Start up the extension event routers.
   void InitEventRouters();
 
-  // Look up an extension by ID.  Does not include terminated
-  // extensions.
+  // Look up an extension by ID.
   virtual const Extension* GetExtensionById(
       const std::string& id, bool include_disabled) const OVERRIDE;
 
-  // Looks up a terminated (crashed) extension by ID.
-  const Extension* GetTerminatedExtension(const std::string& id) const;
-
-  // Looks up an extension by ID, regardless of whether it's enabled,
-  // disabled, or terminated.
+  // Looks up an extension by ID, regardless of whether it's enabled or
+  // disabled.
   virtual const Extension* GetInstalledExtension(
       const std::string& id) const OVERRIDE;
 
@@ -564,12 +559,6 @@ class ExtensionService
   static void RecordPermissionMessagesHistogram(
       const Extension* e, const char* histogram);
 
-#if defined(UNIT_TEST)
-  void TrackTerminatedExtensionForTest(const Extension* extension) {
-    TrackTerminatedExtension(extension);
-  }
-#endif
-
   ExtensionWarningSet* extension_warnings() {
     return &extension_warnings_;
   }
@@ -664,16 +653,7 @@ class ExtensionService
   // and disabled extensions.
   const Extension* GetExtensionByIdInternal(const std::string& id,
                                             bool include_enabled,
-                                            bool include_disabled,
-                                            bool include_terminated) const;
-
-  // Adds the given extension to the list of terminated extensions if
-  // it is not already there and unloads it.
-  void TrackTerminatedExtension(const Extension* extension);
-
-  // Removes the extension with the given id from the list of
-  // terminated extensions if it is there.
-  void UntrackTerminatedExtension(const std::string& id);
+                                            bool include_disabled) const;
 
   // Handles sending notification that |extension| was loaded.
   void NotifyExtensionLoaded(const Extension* extension);
@@ -720,9 +700,6 @@ class ExtensionService
   // The list of installed extensions that have been disabled.
   ExtensionSet disabled_extensions_;
 
-  // The list of installed extensions that have been terminated.
-  ExtensionSet terminated_extensions_;
-
   // Hold the set of pending extensions.
   PendingExtensionManager pending_extension_manager_;