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

chrome/browser/extensions/extension_management_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_management_api.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 230 matching lines @@
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         kUserCantDisableError, extension_id);
     return false;
   }
 
   service()->UninstallExtension(extension_id, false /* external_uninstall */,
                                 NULL);
   return true;
 }
 
-// static
-ExtensionManagementEventRouter* ExtensionManagementEventRouter::GetInstance() {
-  return Singleton<ExtensionManagementEventRouter>::get();
-}
-
 ExtensionManagementEventRouter::ExtensionManagementEventRouter() {}
 
 ExtensionManagementEventRouter::~ExtensionManagementEventRouter() {}
 
-void ExtensionManagementEventRouter::Init() {
+void ExtensionManagementEventRouter::ObserveProfile(Profile* profile) {
   NotificationType::Type types[] = {
     NotificationType::EXTENSION_INSTALLED,
     NotificationType::EXTENSION_UNINSTALLED,
     NotificationType::EXTENSION_LOADED,
     NotificationType::EXTENSION_UNLOADED
   };
 
-  // Don't re-init (eg in the case of multiple profiles).
-  if (registrar_.IsEmpty()) {
-    for (size_t i = 0; i < arraysize(types); i++) {
-      registrar_.Add(this,
-                     types[i],
-                     NotificationService::AllSources());
-    }
+  CHECK(registrar_.IsEmpty());
+  for (size_t i = 0; i < arraysize(types); i++) {
+    registrar_.Add(this,
+                   types[i],
+                   Source<Profile>(profile));
+    registrar_.Add(this,
+                   types[i],
+                   Source<Profile>(profile->GetOffTheRecordProfile()));
   }
 }
 
 void ExtensionManagementEventRouter::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   const char* event_name = NULL;
   switch (type.value) {
     case NotificationType::EXTENSION_INSTALLED:
@@ skipping 33 matching lines @@
     bool enabled = service->GetExtensionById(extension->id(), false) != NULL;
     args.Append(CreateExtensionInfo(*extension, enabled));
   }
 
   std::string args_json;
   base::JSONWriter::Write(&args, false /* pretty_print */, &args_json);
 
   profile->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name, args_json, NULL, GURL());
 }