Simplify the handling of crashed extensions.

chrome/browser/extensions/extension_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 179 matching lines @@
                    const FilePath& install_directory,
                    ExtensionPrefs* extension_prefs,
                    bool autoupdate_enabled,
                    bool extensions_enabled);
 
   virtual ~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.
   virtual PendingExtensionManager* pending_extension_manager() OVERRIDE;
 
   const FilePath& install_directory() const { return install_directory_; }
 
   AppsPromo* apps_promo() { return &apps_promo_; }
 
   extensions::ProcessMap* process_map() { return &process_map_; }
@@ skipping 76 matching lines @@
   // TODO(yoz): remove InitEventRoutersAterImport.
   void InitEventRoutersAfterImport();
   void RegisterForImportFinished();
 
   // Complete some initialization after being notified that import has finished.
   void InitAfterImport();
 
   // 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;
 
   // Updates a currently-installed extension with the contents from
   // |extension_path|.
   // TODO(aa): This method can be removed. ExtensionUpdater could use
   // CrxInstaller directly instead.
   virtual bool UpdateExtension(
       const std::string& id,
       const FilePath& extension_path,
@@ skipping 237 matching lines @@
   // Gets the set of loaded app ids. Component apps are not included.
   ExtensionIdSet GetAppIds() const;
 
   // Record a histogram using the PermissionMessage enum values for each
   // permission in |e|.
   // NOTE: If this is ever called with high frequency, the implementation may
   // need to be made more efficient.
   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_;
   }
 
   // Call only from IO thread.
   extensions::SocketController* socket_controller();
 
   // Implement ImageLoadingTracker::Observer. |tracker_| is used to
   // load the application's icon, which is done when we start creating an
   // application's shortcuts. This method receives the icon, and completes
@@ skipping 74 matching lines @@
 
   // Applies the change specified in an ExtensionSyncData to the current system.
   void ProcessExtensionSyncData(
       const ExtensionSyncData& extension_sync_data,
       SyncBundle& bundle);
 
   // Look up an extension by ID, optionally including either or both of enabled
   // 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);
 
   // Handles sending notification that |extension| was unloaded.
   void NotifyExtensionUnloaded(const Extension* extension,
                                extension_misc::UnloadedExtensionReason reason);
 
   // Helper that updates the active extension list used for crash reporting.
   void UpdateActiveExtensionsInCrashReporter();
@@ skipping 26 matching lines @@
   // Settings for the owning profile.
   scoped_ptr<extensions::SettingsFrontend> settings_frontend_;
 
   // The current list of installed extensions.
   // TODO(aa): This should use chrome/common/extensions/extension_set.h.
   ExtensionSet extensions_;
 
   // 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_;
 
   // The map of extension IDs to their runtime data.
   ExtensionRuntimeDataMap extension_runtime_data_;
 
   // Holds a map between renderer process IDs that are associated with an
   // installed app and their app.
   typedef std::map<int, scoped_refptr<const Extension> > InstalledAppMap;
   InstalledAppMap installed_app_hosts_;
@@ skipping 112 matching lines @@
   scoped_ptr<ExtensionGlobalError> extension_global_error_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_