commit 5fdfa5609d4d74932eb0ef465367eada0cebe56e
author jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Dec 27 17:43:59 2013
committer jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Dec 27 17:43:59 2013
tree f10b8df6fc49fd3010378b8926ad4f8cd7f25acf
parent a85a8c710657170a3f41ee500bc53cca5f7a8692

Convert ExtensionRegistry to a BrowserContextKeyedService

This removes dependencies on ExtensionService, which does not exist for
app_shell.

* Convert all of src/extensions to use ExtensionRegistry's extension sets.
* Remove ExtensionService::blacklisted_extensions() and convert all callers
  to use ExtensionRegistry.

BUG=none
TEST=existing unit_tests, browser_tests
R=miket@chromium.org
TBR=phajden.jr@chromium.org for adding dependency on components/browser_context_keyed_service

Review URL: https://codereview.chromium.org/120863003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242624 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index ee9f6c3..fdfde83 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -329,7 +329,7 @@
       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 @@
   return &registry_->terminated_extensions();
 }
 
-const ExtensionSet* ExtensionService::blacklisted_extensions() const {
-  return &registry_->blacklisted_extensions();
-}
-
 const ExtensionSet* ExtensionService::delayed_installs() const {
   return &delayed_installs_;
 }