Convert ExtensionRegistry to a BrowserContextKeyedService

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_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 143 matching lines @@
                    extensions::Blacklist* blacklist,
                    bool autoupdate_enabled,
                    bool extensions_enabled,
                    extensions::OneShotEvent* ready);
 
   virtual ~ExtensionService();
 
   // Gets the list of currently installed extensions.
   virtual const extensions::ExtensionSet* extensions() const OVERRIDE;
   virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE;
+
+  // DEPRECATED: Use extensions::ExtensionRegistry::terminated_extensions().
   const extensions::ExtensionSet* terminated_extensions() const;

[James Cook, 2013/12/27 01:00:27]

I'll get rid of this soon - doing it now would make this CL too big.

-  const extensions::ExtensionSet* blacklisted_extensions() const;
+
   const extensions::ExtensionSet* delayed_installs() const;
 
   // Returns a set of all installed, disabled, blacklisted, and terminated
   // extensions.
   scoped_ptr<extensions::ExtensionSet> GenerateInstalledExtensionsSet() const;
 
   // Gets the object managing the set of pending extensions.
   virtual extensions::PendingExtensionManager*
       pending_extension_manager() OVERRIDE;
 
@@ skipping 556 matching lines @@
 
   // Blacklist for the owning profile.
   extensions::Blacklist* blacklist_;
 
   // Settings for the owning profile.
   scoped_ptr<extensions::SettingsFrontend> settings_frontend_;
 
   // The ExtensionSyncService that is used by this ExtensionService.
   ExtensionSyncService* extension_sync_service_;
 
-  // TODO(jamescook): Convert this to a BrowserContextKeyedService.
-  scoped_ptr<extensions::ExtensionRegistry> registry_;
+  // Sets of enabled/disabled/terminated/blacklisted extensions. Not owned.
+  extensions::ExtensionRegistry* registry_;

[James Cook, 2013/12/27 01:00:27]

I decided to keep this pointer because there are a bunch of registry lookups in
the .cc file and it seemed more readable to use this than calling
ExtensionRegistry::Get() every time.

 
   // The list of extension installs delayed for various reasons.  The reason
   // for delayed install is stored in ExtensionPrefs. These are not part of
   // ExtensionRegistry because they are not yet installed.
   extensions::ExtensionSet delayed_installs_;
 
   // Hold the set of pending extensions.
   extensions::PendingExtensionManager pending_extension_manager_;
 
   // The map of extension IDs to their runtime data.
@@ skipping 103 matching lines @@
 #endif
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_