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

chrome/browser/extensions/extension_accessibility_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_tabs_module.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 16 matching lines @@
 std::string ControlInfoToJsonString(const AccessibilityControlInfo* info) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   info->SerializeToDict(dict);
   args.Append(dict);
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   return json_args;
 }
 
-ExtensionAccessibilityEventRouter*
-    ExtensionAccessibilityEventRouter::GetInstance() {
-  return Singleton<ExtensionAccessibilityEventRouter>::get();
+ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
+    : enabled_(false) {
 }
 
-ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
-    : enabled_(false) {}
-
 ExtensionAccessibilityEventRouter::~ExtensionAccessibilityEventRouter() {
   STLDeleteElements(&on_enabled_listeners_);
   STLDeleteElements(&on_disabled_listeners_);
 }
 
-void ExtensionAccessibilityEventRouter::ObserveProfile(Profile* profile) {
+void ExtensionAccessibilityEventRouter::Init() {
   last_focused_control_dict_.Clear();
 
   if (registrar_.IsEmpty()) {
     registrar_.Add(this,
                    NotificationType::ACCESSIBILITY_WINDOW_OPENED,
                    NotificationService::AllSources());
     registrar_.Add(this,
                    NotificationType::ACCESSIBILITY_WINDOW_CLOSED,
                    NotificationService::AllSources());
     registrar_.Add(this,
@@ skipping 124 matching lines @@
     const std::string& json_args) {
   if (enabled_ && profile && profile->GetExtensionEventRouter()) {
     profile->GetExtensionEventRouter()->DispatchEventToRenderers(
         event_name, json_args, NULL, GURL());
   }
 }
 
 bool SetAccessibilityEnabledFunction::RunImpl() {
   bool enabled;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(0, &enabled));
-  ExtensionAccessibilityEventRouter::GetInstance()
-      ->SetAccessibilityEnabled(enabled);
+  ExtensionAccessibilityEventRouter* accessibility_event_router =
+      profile()->GetExtensionService()->accessibility_event_router();
+  accessibility_event_router->SetAccessibilityEnabled(enabled);
   return true;
 }
 
 bool GetFocusedControlFunction::RunImpl() {
   // Get the serialized dict from the last focused control and return it.
   // However, if the dict is empty, that means we haven't seen any focus
   // events yet, so return null instead.
-  ExtensionAccessibilityEventRouter *accessibility_event_router =
-      ExtensionAccessibilityEventRouter::GetInstance();
+  ExtensionAccessibilityEventRouter* accessibility_event_router =
+      profile()->GetExtensionService()->accessibility_event_router();
   DictionaryValue *last_focused_control_dict =
       accessibility_event_router->last_focused_control_dict();
   if (last_focused_control_dict->size()) {
     result_.reset(last_focused_control_dict->DeepCopyWithoutEmptyChildren());
   } else {
     result_.reset(Value::CreateNullValue());
   }
   return true;
 }