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

chrome/browser/extensions/extension_webnavigation_api.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Defines the Chrome Extensions WebNavigation API functions for observing and
 // intercepting navigation events, as specified in
 // chrome/common/extensions/api/extension_api.json.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_H_
 #pragma once
 
 #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"
 #include "googleurl/src/gurl.h"
 
 class TabContents;
 struct ViewHostMsg_CreateWindow_Params;
 
 // Tracks the navigation state of all frames currently known to the
 // webNavigation API. It is mainly used to track in which frames an error
@@ skipping 98 matching lines @@
   // Tracks the state of the frames we are sending events for.
   FrameNavigationState navigation_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebNavigationTabObserver);
 };
 
 // Observes navigation notifications and routes them as events to the extension
 // 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,
                        const NotificationDetails& details);
 
   // Handler for the CREATING_NEW_WINDOW event. The method takes the details of
   // such an event and constructs a suitable JSON formatted extension event from
   // it.
   void CreatingNewWindow(TabContents* tab_content,
                          const ViewHostMsg_CreateWindow_Params* details);
 
   // Used for tracking registrations to navigation notifications.
   NotificationRegistrar registrar_;
 
+  // The profile that owns us via ExtensionService.
+  Profile* profile_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebNavigationEventRouter);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_H_