Change event routers from singletons to being owned by the ExtensionService.

chrome/browser/extensions/extension_service.h

Index: chrome/browser/extensions/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index a30f875136a565c4d1adfc81cf7b083fbcb2924d..ce1e256fa9e6260ef71d55127f170215b85c5c7b 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -39,10 +39,18 @@
 #include "content/common/property_bag.h"
 
 class CrxInstaller;
+class ExtensionAccessibilityEventRouter;
+class ExtensionBookmarkEventRouter;
 class ExtensionBrowserEventRouter;
 class ExtensionContentSettingsStore;
+class ExtensionCookiesEventRouter;
+class ExtensionFileBrowserEventRouter;
+class ExtensionHistoryEventRouter;
 class ExtensionInstallUI;
+class ExtensionManagementEventRouter;
 class ExtensionPreferenceEventRouter;
+class ExtensionProcessesEventRouter;
+class ExtensionWebNavigationEventRouter;
 class ExtensionServiceBackend;
 struct ExtensionSyncData;
 class ExtensionToolbarModel;
@@ -434,10 +442,18 @@ class ExtensionService
 
   ExtensionMenuManager* menu_manager() { return &menu_manager_; }
 
+  ExtensionAccessibilityEventRouter* accessibility_event_router() {
+    return accessibility_event_router_.get();
+  }
+
   ExtensionBrowserEventRouter* browser_event_router() {
     return browser_event_router_.get();
   }
 
+  ExtensionProcessesEventRouter* processes_event_router() {
+    return processes_event_router_.get();
+  }
+
   // Notify the frontend that there was an error loading an extension.
   // This method is public because ExtensionServiceBackend can post to here.
   void ReportExtensionLoadError(const FilePath& extension_path,
@@ -675,9 +691,19 @@ class ExtensionService
   // Flag to make sure event routers are only initialized once.
   bool event_routers_initialized_;
 
+  scoped_ptr<ExtensionHistoryEventRouter> history_event_router_;
+  scoped_ptr<ExtensionAccessibilityEventRouter> accessibility_event_router_;
   scoped_ptr<ExtensionBrowserEventRouter> browser_event_router_;
-
   scoped_ptr<ExtensionPreferenceEventRouter> preference_event_router_;
+  scoped_ptr<ExtensionBookmarkEventRouter> bookmark_event_router_;
+  scoped_ptr<ExtensionCookiesEventRouter> cookies_event_router_;
+  scoped_ptr<ExtensionManagementEventRouter> management_event_router_;
+  scoped_ptr<ExtensionProcessesEventRouter> processes_event_router_;
+  scoped_ptr<ExtensionWebNavigationEventRouter> web_navigation_event_router_;
+
+#if defined(OS_CHROMEOS)
+  scoped_ptr<ExtensionFileBrowserEventRouter> file_browser_event_router_;
+#endif
 
   // A collection of external extension providers.  Each provider reads
   // a source of external extension information.  Examples include the