Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_service.h

 // Copyright (c) 2011 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 23 matching lines @@
 #include "chrome/browser/extensions/extensions_quota_service.h"
 #include "chrome/browser/extensions/external_extension_provider_interface.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/api/syncable_service.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class AppNotificationManager;
 class BookmarkExtensionEventRouter;
 class CrxInstaller;
 class ExtensionBrowserEventRouter;
 class ExtensionContentSettingsStore;
 class ExtensionCookiesEventRouter;
@@ skipping 25 matching lines @@
 // This is an interface class to encapsulate the dependencies that
 // various classes have on ExtensionService. This allows easy mocking.
 class ExtensionServiceInterface : public SyncableService {
  public:
   // A function that returns true if the given extension should be
   // included and false if it should be filtered out.  Identical to
   // PendingExtensionInfo::ShouldAllowInstallPredicate.
   typedef bool (*ExtensionFilter)(const Extension&);
 
   virtual ~ExtensionServiceInterface() {}
-  virtual const ExtensionList* extensions() const = 0;
+  virtual const ExtensionSet* extensions() const = 0;
   virtual PendingExtensionManager* pending_extension_manager() = 0;
 
   // Install an update.  Return true if the install can be started.
   // Set out_crx_installer to the installer if one was started.
   virtual bool UpdateExtension(
       const std::string& id,
       const FilePath& path,
       const GURL& download_url,
       CrxInstaller** out_crx_installer) = 0;
   virtual const Extension* GetExtensionById(const std::string& id,
@@ skipping 85 matching lines @@
   ExtensionService(Profile* profile,
                    const CommandLine* command_line,
                    const FilePath& install_directory,
                    ExtensionPrefs* extension_prefs,
                    bool autoupdate_enabled,
                    bool extensions_enabled);
 
   virtual ~ExtensionService();
 
   // Gets the list of currently installed extensions.
-  virtual const ExtensionList* extensions() const OVERRIDE;
-  const ExtensionList* disabled_extensions() const;
-  const ExtensionList* terminated_extensions() const;
+  virtual const ExtensionSet* extensions() const OVERRIDE;
+  const ExtensionSet* disabled_extensions() const;
+  const ExtensionSet* terminated_extensions() 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 420 matching lines @@
   std::vector<ExtensionSyncData> GetSyncDataList(
       const SyncBundle& bundle) const;
 
   // Gets the sync data for the given extension, assuming that the extension is
   // syncable.
   ExtensionSyncData GetSyncData(const Extension& extension) const;
 
   // Appends sync data objects for every extension in |extensions|
   // that passes |filter|.
   void GetSyncDataListHelper(
-      const ExtensionList& extensions,
+      const ExtensionSet& extensions,
       const SyncBundle& bundle,
       std::vector<ExtensionSyncData>* sync_data_list) const;
 
   // 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.
@@ skipping 39 matching lines @@
   Profile* profile_;
 
   // Preferences for the owning profile (weak reference).
   ExtensionPrefs* extension_prefs_;
 
   // 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.
-  ExtensionList extensions_;
+  ExtensionSet extensions_;
 
   // The list of installed extensions that have been disabled.
-  ExtensionList disabled_extensions_;
+  ExtensionSet disabled_extensions_;
 
   // The list of installed extensions that have been terminated.
-  ExtensionList terminated_extensions_;
-
-  // Used to quickly check if an extension was terminated.
-  std::set<std::string> terminated_extension_ids_;
+  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;
@@ skipping 106 matching lines @@
   extensions::ProcessMap process_map_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_