Change many extension event routers to not be singletons and to be more profile-aware.

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 7aae4ec432189b2ff7d2328b71e2918b4d4c9535..83ae397897ec67d0ce6b992df0c5efdaad21ae75 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -39,14 +39,20 @@
 #include "content/common/property_bag.h"
 
 class CrxInstaller;
+class ExtensionBookmarkEventRouter;
 class ExtensionBrowserEventRouter;
 class ExtensionContentSettingsStore;
+class ExtensionCookiesEventRouter;
+class ExtensionFileBrowserEventRouter;
+class ExtensionHistoryEventRouter;
 class ExtensionInstallUI;
+class ExtensionManagementEventRouter;
 class ExtensionPreferenceEventRouter;
 class ExtensionServiceBackend;
 struct ExtensionSyncData;
 class ExtensionToolbarModel;
 class ExtensionUpdater;
+class ExtensionWebNavigationEventRouter;
 class GURL;
 class PendingExtensionManager;
 class Profile;
@@ -697,10 +703,24 @@ class ExtensionService
   // Flag to make sure event routers are only initialized once.
   bool event_routers_initialized_;
 
+  scoped_ptr<ExtensionHistoryEventRouter> history_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<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
   // windows registry and external_extensions.json.