diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-27 17:43:59 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-27 17:43:59 +0000 |
| commit | 5fdfa5609d4d74932eb0ef465367eada0cebe56e (patch) | |
| tree | f10b8df6fc49fd3010378b8926ad4f8cd7f25acf /extensions/browser/lazy_background_task_queue.cc | |
| parent | a85a8c710657170a3f41ee500bc53cca5f7a8692 (diff) | |
| download | chromium_src-5fdfa5609d4d74932eb0ef465367eada0cebe56e.zip chromium_src-5fdfa5609d4d74932eb0ef465367eada0cebe56e.tar.gz chromium_src-5fdfa5609d4d74932eb0ef465367eada0cebe56e.tar.bz2 | |
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
Diffstat (limited to 'extensions/browser/lazy_background_task_queue.cc')
| -rw-r--r-- | extensions/browser/lazy_background_task_queue.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc index f53cdd3..2a52503 100644 --- a/extensions/browser/lazy_background_task_queue.cc +++ b/extensions/browser/lazy_background_task_queue.cc @@ -7,7 +7,6 @@ #include "base/callback.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/browser_context.h" @@ -16,6 +15,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_registry.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" @@ -73,11 +73,9 @@ void LazyBackgroundTaskQueue::AddPendingTask( tasks_list = new PendingTasksList(); pending_tasks_[key] = linked_ptr<PendingTasksList>(tasks_list); - ExtensionService* extension_service = ExtensionSystem::GetForBrowserContext( - browser_context)->extension_service(); - DCHECK(extension_service); const Extension* extension = - extension_service->extensions()->GetByID(extension_id); + ExtensionRegistry::Get(browser_context)->enabled_extensions().GetByID( + extension_id); if (extension && BackgroundInfo::HasLazyBackgroundPage(extension)) { // If this is the first enqueued task, and we're not waiting for the // background page to unload, ensure the background page is loaded. |