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

chrome/browser/extensions/extension_bookmarks_module.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_bookmarks_module.h"
 
 #include "base/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"
@@ skipping 100 matching lines @@
 
 void BookmarksFunction::Observe(NotificationType type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   DCHECK(type == NotificationType::BOOKMARK_MODEL_LOADED);
   DCHECK(profile()->GetBookmarkModel()->IsLoaded());
   Run();
   Release();  // Balanced in Run().
 }
 
-// static
-ExtensionBookmarkEventRouter* ExtensionBookmarkEventRouter::GetInstance() {
-  return Singleton<ExtensionBookmarkEventRouter>::get();
-}
-
 ExtensionBookmarkEventRouter::ExtensionBookmarkEventRouter() {
 }
 
 ExtensionBookmarkEventRouter::~ExtensionBookmarkEventRouter() {
 }
 
 void ExtensionBookmarkEventRouter::Observe(BookmarkModel* model) {
-  if (models_.find(model) == models_.end()) {
-    model->AddObserver(this);
-    models_.insert(model);
-  }
+  model->AddObserver(this);

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

Is there a matching call to RemoveObserver somewhere? I expected to see it in
here somewhere.

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

There wasn't before... we should probably have one assuming the model hasn't
been destroyed by the time the router is destroyed. Can we count on that?

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

Looks like BookmarkModelObserver's get their BookmarkModelBeingDeleted method
called when the model is being destructed, so we can just implement that and
drop our ptr to the model then, and skip calling RemoveObserver in our own
destructor here if the ptr is NULL. 

[Yoyo Zhou, 2011/06/24 22:10:33]

We don't keep a pointer to the model anymore; I guess we would have to to use it
in our own destructor.

Both the ExtensionService and BookmarkModel are scoped_ptrs held by the Profile,
so they would get destroyed at approximately the same time.

 }
 
 void ExtensionBookmarkEventRouter::DispatchEvent(Profile *profile,
                                                  const char* event_name,
                                                  const std::string& json_args) {
   if (profile->GetExtensionEventRouter()) {
     profile->GetExtensionEventRouter()->DispatchEventToRenderers(
         event_name, json_args, NULL, GURL());
   }
 }
@@ skipping 778 matching lines @@
   SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE);
   return true;
 }
 
 void ExportBookmarksFunction::FileSelected(const FilePath& path,
                                            int index,
                                            void* params) {
   bookmark_html_writer::WriteBookmarks(profile(), path, NULL);
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }