Convert ExtensionRegistry to a BrowserContextKeyedService

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 8545283f19dea0624be3717e0c30ca3c2b708579..f8a7bba4630b4313ace839320d01b7107065b9fc 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -161,8 +161,10 @@ class 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
@@ -739,8 +741,8 @@ class ExtensionService
   // 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