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

chrome/browser/extensions/extension_webnavigation_api.h

Index: chrome/browser/extensions/extension_webnavigation_api.h
diff --git a/chrome/browser/extensions/extension_webnavigation_api.h b/chrome/browser/extensions/extension_webnavigation_api.h
index 9f475dc1ea3dc3c1d8aa76ab0fa3e038d6060eee..431507d0d2a91eedc8bce1732ec53395d3951217 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.h
+++ b/chrome/browser/extensions/extension_webnavigation_api.h
@@ -12,8 +12,8 @@
 
 #include <map>
 
-#include "base/memory/singleton.h"
 #include "chrome/browser/extensions/extension_function.h"
+#include "chrome/browser/profiles/profile.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -132,19 +132,14 @@ class ExtensionWebNavigationTabObserver : public TabContentsObserver {
 // system.
 class ExtensionWebNavigationEventRouter : public NotificationObserver {
  public:
-  // Returns the singleton instance of the event router.
-  static ExtensionWebNavigationEventRouter* GetInstance();
+  explicit ExtensionWebNavigationEventRouter(Profile* profile);
+  virtual ~ExtensionWebNavigationEventRouter();
 
   // Invoked by the extensions service once the extension system is fully set
   // up and can start dispatching events to extensions.
   void Init();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionWebNavigationEventRouter>;
-
-  ExtensionWebNavigationEventRouter();
-  virtual ~ExtensionWebNavigationEventRouter();
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -159,6 +154,9 @@ class ExtensionWebNavigationEventRouter : public NotificationObserver {
   // Used for tracking registrations to navigation notifications.
   NotificationRegistrar registrar_;
 
+  // The profile that owns us via ExtensionService.
+  Profile* profile_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebNavigationEventRouter);
 };