Convert ExtensionRegistry to a BrowserContextKeyedService

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index ee9f6c370346d2d0a2e76822ddab46adf0d00be2..fdfde83b5e8854ce17d06140c17c67ea4beb3937 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -329,7 +329,7 @@ ExtensionService::ExtensionService(Profile* profile,
       blacklist_(blacklist),
       settings_frontend_(extensions::SettingsFrontend::Create(profile)),
       extension_sync_service_(NULL),
-      registry_(new extensions::ExtensionRegistry),
+      registry_(extensions::ExtensionRegistry::Get(profile)),
       pending_extension_manager_(*this),
       install_directory_(install_directory),
       extensions_enabled_(extensions_enabled),
@@ -422,10 +422,6 @@ const ExtensionSet* ExtensionService::terminated_extensions() const {
   return &registry_->terminated_extensions();
 }
 
-const ExtensionSet* ExtensionService::blacklisted_extensions() const {
-  return &registry_->blacklisted_extensions();
-}
-
 const ExtensionSet* ExtensionService::delayed_installs() const {
   return &delayed_installs_;
 }