Reland 166821 - Lazy initialization for ProcessesEventRouter.

chrome/browser/extensions/extension_system.cc

Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index cf5b5d451641efe65d414bd09684c4c30aefa38b..8e548965c80d0a72a7d15f7a45ffb7b90bd3e847 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -85,6 +85,8 @@ void ExtensionSystemImpl::Shared::InitPrefs() {
       profile_->GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
       ExtensionPrefValueMapFactory::GetForProfile(profile_)));
   extension_prefs_->Init(extensions_disabled);
+  lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(profile_));
+  event_router_.reset(new EventRouter(profile_, extension_prefs_.get()));
 
   state_store_.reset(new StateStore(
       profile_,
@@ -102,10 +104,7 @@ void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {
 void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
-  lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(profile_));
   message_service_.reset(new MessageService(lazy_background_task_queue_.get()));
-  extension_event_router_.reset(new EventRouter(profile_,
-                                                extension_prefs_.get()));
   navigation_observer_.reset(new NavigationObserver(profile_));
 
   ExtensionErrorReporter::Init(true);  // allow noisy errors.
@@ -237,7 +236,7 @@ MessageService* ExtensionSystemImpl::Shared::message_service() {
 }
 
 EventRouter* ExtensionSystemImpl::Shared::event_router() {
-  return extension_event_router_.get();
+  return event_router_.get();
 }
 
 //