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

chrome/browser/extensions/extension_history_api.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_history_api.h"
 
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 46 matching lines @@
 }
 
 void AddVisitNode(const history::VisitRow& row, ListValue* list) {
   DictionaryValue* dict = new DictionaryValue();
   GetVisitInfoDictionary(row, dict);
   list->Append(dict);
 }
 
 }  // namespace
 
-ExtensionHistoryEventRouter* ExtensionHistoryEventRouter::GetInstance() {
-  return Singleton<ExtensionHistoryEventRouter>::get();
-}
-
-void ExtensionHistoryEventRouter::ObserveProfile(Profile* profile) {
-  NotificationSource source = Source<Profile>(profile);
-  if (profiles_.find(source.map_key()) == profiles_.end())
-    profiles_[source.map_key()] = profile;
-
-  if (registrar_.IsEmpty()) {
-    registrar_.Add(this,
-                   NotificationType::HISTORY_URL_VISITED,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   NotificationType::HISTORY_URLS_DELETED,
-                   NotificationService::AllSources());
-  }
-}
-
 ExtensionHistoryEventRouter::ExtensionHistoryEventRouter() {}
 
 ExtensionHistoryEventRouter::~ExtensionHistoryEventRouter() {}
 
+void ExtensionHistoryEventRouter::ObserveProfile(Profile* profile) {
+  NotificationSource source = Source<Profile>(profile);
+  if (registrar_.IsEmpty()) {

[asargent_no_longer_on_chrome, 2011/06/23 22:18:38]

since you removed the "this is safe to call multiple times" comment, should we
just CHECK(registrar_.IsEmpty()) at the beginning of this function?

[Yoyo Zhou, 2011/06/24 17:21:38]

Ok. (I don't know why we went to the effort of making things safe to call
multiple times when we never actually tried to call them multiple times.)

[asargent_no_longer_on_chrome, 2011/06/24 18:56:39]

Me neither. =) 

+    registrar_.Add(this,
+                   NotificationType::HISTORY_URL_VISITED,
+                   source);
+    registrar_.Add(this,
+                   NotificationType::HISTORY_URLS_DELETED,
+                   source);
+  }
+}
+
 void ExtensionHistoryEventRouter::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
-  ProfileMap::iterator it = profiles_.find(source.map_key());
-  if (it != profiles_.end()) {
-    Profile* profile = it->second;
-    switch (type.value) {
-      case NotificationType::HISTORY_URL_VISITED:
-        HistoryUrlVisited(
-            profile,
-            Details<const history::URLVisitedDetails>(details).ptr());
-        break;
-      case NotificationType::HISTORY_URLS_DELETED:
-        HistoryUrlsRemoved(
-            profile,
-            Details<const history::URLsDeletedDetails>(details).ptr());
-        break;
-      default:
-        NOTREACHED();
-    }
+  switch (type.value) {
+    case NotificationType::HISTORY_URL_VISITED:
+      HistoryUrlVisited(
+          Source<Profile>(source).ptr(),
+          Details<const history::URLVisitedDetails>(details).ptr());
+      break;
+    case NotificationType::HISTORY_URLS_DELETED:
+      HistoryUrlsRemoved(
+          Source<Profile>(source).ptr(),
+          Details<const history::URLsDeletedDetails>(details).ptr());
+      break;
+    default:
+      NOTREACHED();
   }
 }
 
 void ExtensionHistoryEventRouter::HistoryUrlVisited(
     Profile* profile,
     const history::URLVisitedDetails* details) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   GetHistoryItemDictionary(details->row, dict);
   args.Append(dict);
@@ skipping 256 matching lines @@
       base::Time::Now(),           // To the current time.
       &cancelable_consumer_,
       NewCallback(this, &DeleteAllHistoryFunction::DeleteComplete));
 
   return true;
 }
 
 void DeleteAllHistoryFunction::DeleteComplete() {
   SendAsyncResponse();
 }