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

chrome/browser/extensions/extension_processes_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_processes_api.h"
 
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 24 matching lines @@
   DictionaryValue* result = new DictionaryValue();
   result->SetInteger(keys::kIdKey, process_id);
   result->SetString(keys::kTypeKey, type);
   result->SetDouble(keys::kCpuKey, cpu);
   result->SetDouble(keys::kNetworkKey, static_cast<double>(net));
   result->SetDouble(keys::kPrivateMemoryKey, static_cast<double>(pr_mem));
   result->SetDouble(keys::kSharedMemoryKey, static_cast<double>(sh_mem));
   return result;
 }
 
-ExtensionProcessesEventRouter* ExtensionProcessesEventRouter::GetInstance() {
-  return Singleton<ExtensionProcessesEventRouter>::get();
-}
-
-ExtensionProcessesEventRouter::ExtensionProcessesEventRouter() {
-  model_ = TaskManager::GetInstance()->model();
-  model_->AddObserver(this);
+ExtensionProcessesEventRouter::ExtensionProcessesEventRouter(Profile* profile)
+    : profile_(profile) {
 }
 
 ExtensionProcessesEventRouter::~ExtensionProcessesEventRouter() {
   model_->RemoveObserver(this);
 }
 
-void ExtensionProcessesEventRouter::ObserveProfile(Profile* profile) {
-  profiles_.insert(profile);
+void ExtensionProcessesEventRouter::Init() {
+  model_ = TaskManager::GetInstance()->model();
+  model_->AddObserver(this);
 }
 
 void ExtensionProcessesEventRouter::ListenerAdded() {
   model_->StartUpdating();
 }
 
 void ExtensionProcessesEventRouter::ListenerRemoved() {
   model_->StopUpdating();
 }
 
@@ skipping 61 matching lines @@
         // Store each process indexed by the string version of its id
         processes->Set(base::IntToString(id),
                        CreateProcessValue(id, type, cpu, net, pr_mem, sh_mem));
       }
     }
     args.Append(processes);
 
     std::string json_args;
     base::JSONWriter::Write(&args, false, &json_args);
 
-    // Notify each profile that is interested.
-    for (ProfileSet::iterator it = profiles_.begin();
-         it != profiles_.end(); it++) {
-      Profile* profile = *it;
-      DispatchEvent(profile, keys::kOnUpdated, json_args);
-    }
+    // Notify the profile.
+    DispatchEvent(profile_, keys::kOnUpdated, json_args);
   }
 }
 
 void ExtensionProcessesEventRouter::DispatchEvent(Profile* profile,
     const char* event_name,
     const std::string& json_args) {
   if (profile && profile->GetExtensionEventRouter()) {
     profile->GetExtensionEventRouter()->DispatchEventToRenderers(
         event_name, json_args, NULL, GURL());
   }
@@ skipping 12 matching lines @@
         base::IntToString(tab_id));
     return false;
   }
 
   // Return the process ID of the tab as an integer.
   int id = base::GetProcId(contents->tab_contents()->
       GetRenderProcessHost()->GetHandle());
   result_.reset(Value::CreateIntegerValue(id));
   return true;
 }