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(
+    BookmarkModel* model) : model_(model) {
 }
 
 ExtensionBookmarkEventRouter::~ExtensionBookmarkEventRouter() {
-}
-
-void ExtensionBookmarkEventRouter::Observe(BookmarkModel* model) {
-  if (models_.find(model) == models_.end()) {
-    model->AddObserver(this);
-    models_.insert(model);
+  if (model_) {
+    model_->RemoveObserver(this);
   }
 }
 
+void ExtensionBookmarkEventRouter::Init() {
+  model_->AddObserver(this);
+}
+
 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());
   }
 }
 
 void ExtensionBookmarkEventRouter::Loaded(BookmarkModel* model) {
   // TODO(erikkay): Perhaps we should send this event down to the extension
   // so they know when it's safe to use the API?
 }
 
+void ExtensionBookmarkEventRouter::BookmarkModelBeingDeleted(
+    BookmarkModel* model) {
+  model_ = NULL;
+}
+
 void ExtensionBookmarkEventRouter::BookmarkNodeMoved(
     BookmarkModel* model,
     const BookmarkNode* old_parent,
     int old_index,
     const BookmarkNode* new_parent,
     int new_index) {
   ListValue args;
   const BookmarkNode* node = new_parent->GetChild(new_index);
   args.Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* object_args = new DictionaryValue();
@@ skipping 762 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()
 }