diff options
| author | juncai <juncai@chromium.org> | 2015-05-20 15:20:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-20 22:20:17 +0000 |
| commit | 07ea53870ed17c6f4f410c5ae0838cf4fceec1c3 (patch) | |
| tree | c4f81ad24ce989b62095730e369c628677b5805c /chrome/browser/extensions | |
| parent | fc092256287403e7326635e2a818a00d43269947 (diff) | |
| download | chromium_src-07ea53870ed17c6f4f410c5ae0838cf4fceec1c3.zip chromium_src-07ea53870ed17c6f4f410c5ae0838cf4fceec1c3.tar.gz chromium_src-07ea53870ed17c6f4f410c5ae0838cf4fceec1c3.tar.bz2 | |
Extract LazyBackgroundTaskQueue from ExtensionSystem.
This patch removes lazy_background_task_queue accessor from ExtensionSystem.
It can be its own browser context keyed service.
It can be built by its new factory.
Review URL: https://codereview.chromium.org/1129063011
Cr-Commit-Position: refs/heads/master@{#330815}
Diffstat (limited to 'chrome/browser/extensions')
6 files changed, 2 insertions, 32 deletions
diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc index 0372d63..c35b377 100644 --- a/chrome/browser/extensions/api/messaging/message_service.cc +++ b/chrome/browser/extensions/api/messaging/message_service.cc @@ -218,7 +218,7 @@ void MessageService::AllocatePortIdPair(int* port1, int* port2) { MessageService::MessageService(BrowserContext* context) : lazy_background_task_queue_( - ExtensionSystem::Get(context)->lazy_background_task_queue()), + LazyBackgroundTaskQueue::Get(context)), weak_factory_(this) { registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, content::NotificationService::AllBrowserContextsAndSources()); diff --git a/chrome/browser/extensions/devtools_util.cc b/chrome/browser/extensions/devtools_util.cc index 8f75ac7..722f8c0 100644 --- a/chrome/browser/extensions/devtools_util.cc +++ b/chrome/browser/extensions/devtools_util.cc @@ -7,7 +7,6 @@ #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/extension_host.h" -#include "extensions/browser/extension_system.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" @@ -27,13 +26,12 @@ void InspectExtensionHost(ExtensionHost* host) { void InspectBackgroundPage(const Extension* extension, Profile* profile) { DCHECK(extension); - ExtensionSystem* system = ExtensionSystem::Get(profile); ExtensionHost* host = ProcessManager::Get(profile) ->GetBackgroundHostForExtension(extension->id()); if (host) { InspectExtensionHost(host); } else { - system->lazy_background_task_queue()->AddPendingTask( + LazyBackgroundTaskQueue::Get(profile)->AddPendingTask( profile, extension->id(), base::Bind(&InspectExtensionHost)); diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc index acaaf97..667a693 100644 --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc @@ -99,7 +99,6 @@ ExtensionSystemImpl::Shared::~Shared() { } void ExtensionSystemImpl::Shared::InitPrefs() { - lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(profile_)); event_router_.reset(new EventRouter(profile_, ExtensionPrefs::Get(profile_))); // Two state stores. The latter, which contains declarative rules, must be // loaded immediately so that the rules are ready before we issue network @@ -431,11 +430,6 @@ InfoMap* ExtensionSystemImpl::Shared::info_map() { return extension_info_map_.get(); } -LazyBackgroundTaskQueue* - ExtensionSystemImpl::Shared::lazy_background_task_queue() { - return lazy_background_task_queue_.get(); -} - EventRouter* ExtensionSystemImpl::Shared::event_router() { return event_router_.get(); } @@ -504,10 +498,6 @@ StateStore* ExtensionSystemImpl::rules_store() { InfoMap* ExtensionSystemImpl::info_map() { return shared_->info_map(); } -LazyBackgroundTaskQueue* ExtensionSystemImpl::lazy_background_task_queue() { - return shared_->lazy_background_task_queue(); -} - EventRouter* ExtensionSystemImpl::event_router() { return shared_->event_router(); } diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h index 151a8cb..f4b19c4 100644 --- a/chrome/browser/extensions/extension_system_impl.h +++ b/chrome/browser/extensions/extension_system_impl.h @@ -42,7 +42,6 @@ class ExtensionSystemImpl : public ExtensionSystem { SharedUserScriptMaster* shared_user_script_master() override; // shared StateStore* state_store() override; // shared StateStore* rules_store() override; // shared - LazyBackgroundTaskQueue* lazy_background_task_queue() override; // shared InfoMap* info_map() override; // shared EventRouter* event_router() override; // shared QuotaService* quota_service() override; // shared @@ -85,7 +84,6 @@ class ExtensionSystemImpl : public ExtensionSystem { ManagementPolicy* management_policy(); SharedUserScriptMaster* shared_user_script_master(); InfoMap* info_map(); - LazyBackgroundTaskQueue* lazy_background_task_queue(); EventRouter* event_router(); QuotaService* quota_service(); const OneShotEvent& ready() const { return ready_; } @@ -102,7 +100,6 @@ class ExtensionSystemImpl : public ExtensionSystem { scoped_ptr<StateStore> rules_store_; // LazyBackgroundTaskQueue is a dependency of // MessageService and EventRouter. - scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_; scoped_ptr<EventRouter> event_router_; scoped_ptr<NavigationObserver> navigation_observer_; // Shared memory region manager for scripts statically declared in extension diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index fd81b7b..9b9ea70 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -48,10 +48,6 @@ void TestExtensionSystem::Shutdown() { extension_service_->Shutdown(); } -void TestExtensionSystem::CreateLazyBackgroundTaskQueue() { - lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(profile_)); -} - ExtensionPrefs* TestExtensionSystem::CreateExtensionPrefs( const base::CommandLine* command_line, const base::FilePath& install_directory) { @@ -134,11 +130,6 @@ StateStore* TestExtensionSystem::rules_store() { InfoMap* TestExtensionSystem::info_map() { return info_map_.get(); } -LazyBackgroundTaskQueue* -TestExtensionSystem::lazy_background_task_queue() { - return lazy_background_task_queue_.get(); -} - void TestExtensionSystem::SetEventRouter(scoped_ptr<EventRouter> event_router) { event_router_.reset(event_router.release()); } diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h index 62ee4d1..06a5761 100644 --- a/chrome/browser/extensions/test_extension_system.h +++ b/chrome/browser/extensions/test_extension_system.h @@ -53,10 +53,6 @@ class TestExtensionSystem : public ExtensionSystem { void CreateSocketManager(); - // Creates a LazyBackgroundTaskQueue. If not invoked, the - // LazyBackgroundTaskQueue is NULL. - void CreateLazyBackgroundTaskQueue(); - void InitForRegularProfile(bool extensions_enabled) override {} void SetExtensionService(ExtensionService* service); ExtensionService* extension_service() override; @@ -67,7 +63,6 @@ class TestExtensionSystem : public ExtensionSystem { StateStore* rules_store() override; TestingValueStore* value_store() { return value_store_; } InfoMap* info_map() override; - LazyBackgroundTaskQueue* lazy_background_task_queue() override; void SetEventRouter(scoped_ptr<EventRouter> event_router); EventRouter* event_router() override; QuotaService* quota_service() override; @@ -94,7 +89,6 @@ class TestExtensionSystem : public ExtensionSystem { scoped_ptr<RuntimeData> runtime_data_; scoped_ptr<ExtensionService> extension_service_; scoped_refptr<InfoMap> info_map_; - scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_; scoped_ptr<EventRouter> event_router_; scoped_ptr<QuotaService> quota_service_; OneShotEvent ready_; |