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

This breaks, among other things, multi-profile and the first run dialog.
Reverting at least for M13.

This reverts commit 45758c29485736d7164085e6b7f8bf0999df1c4f.

BUG=81745
TEST=none

Review URL: http://codereview.chromium.org/7084006

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

1 files changed, 1 insertions, 27 deletions

diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index bdc78ca..1771e4e 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -39,18 +39,10 @@
 #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;
@@ -442,18 +434,10 @@ 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,
@@ -695,19 +679,9 @@ 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