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

chrome/browser/extensions/extension_bookmarks_module.cc

Index: chrome/browser/extensions/extension_bookmarks_module.cc
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index 33a0d19bfa76ca78ca0d7c06f6f026b53df1a436..8c31a72dd6b62892079fa540cee8923c6e576f0c 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -117,22 +117,13 @@ void BookmarksFunction::Observe(NotificationType type,
   Release();  // Balanced in Run().
 }
 
-// static
-ExtensionBookmarkEventRouter* ExtensionBookmarkEventRouter::GetInstance() {
-  return Singleton<ExtensionBookmarkEventRouter>::get();
-}
-
-ExtensionBookmarkEventRouter::ExtensionBookmarkEventRouter() {
-}
+ExtensionBookmarkEventRouter::ExtensionBookmarkEventRouter() {}
 
-ExtensionBookmarkEventRouter::~ExtensionBookmarkEventRouter() {
-}
+ExtensionBookmarkEventRouter::~ExtensionBookmarkEventRouter() {}
 
 void ExtensionBookmarkEventRouter::Observe(BookmarkModel* model) {
-  if (models_.find(model) == models_.end()) {
-    model->AddObserver(this);
-    models_.insert(model);
-  }
+  model->AddObserver(this);
+  model_ = model;
 }
 
 void ExtensionBookmarkEventRouter::DispatchEvent(Profile *profile,