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

chrome/browser/extensions/extension_history_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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_HISTORY_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_HISTORY_API_H_
 #pragma once
 
 #include <map>
 #include <string>
 
-#include "base/memory/singleton.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "content/common/notification_registrar.h"
 
+class Profile;
+
 // Observes History service and routes the notifications as events to the
 // extension system.
 class ExtensionHistoryEventRouter : public NotificationObserver {
  public:
-  // Single instance of the event router.
-  static ExtensionHistoryEventRouter* GetInstance();
+  explicit ExtensionHistoryEventRouter(Profile* profile)
+      : profile_(profile) {}
+  virtual ~ExtensionHistoryEventRouter() {}

[asargent_no_longer_on_chrome, 2011/05/24 18:18:00]

same inlining nit here

 
-  // Safe to call multiple times.
-  void ObserveProfile(Profile* profile);
+  void Init();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionHistoryEventRouter>;
-
-  ExtensionHistoryEventRouter();
-  virtual ~ExtensionHistoryEventRouter();
-
   // NotificationObserver::Observe.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   void HistoryUrlVisited(Profile* profile,
                          const history::URLVisitedDetails* details);
 
   void HistoryUrlsRemoved(Profile* profile,
                           const history::URLsDeletedDetails* details);
 
   void DispatchEvent(Profile* profile,
                      const char* event_name,
                      const std::string& json_args);
 
   // Used for tracking registrations to history service notifications.
   NotificationRegistrar registrar_;
 
-  // Registered profiles.
-  typedef std::map<uintptr_t, Profile*> ProfileMap;
-  ProfileMap profiles_;
+  // The associated Profile owns us transitively via ExtensionService.
+  Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionHistoryEventRouter);
 };
 
 
 // Base class for history function APIs.
 class HistoryFunction : public AsyncExtensionFunction {
  public:
   virtual void Run();
   virtual bool RunImpl() = 0;
@@ skipping 77 matching lines @@
 class DeleteRangeHistoryFunction : public HistoryFunctionWithCallback {
  public:
   virtual bool RunAsyncImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("history.deleteRange");
 
   // Callback for the history service to acknowledge deletion.
   void DeleteComplete();
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_HISTORY_API_H_