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

chrome/browser/ui/views/accessibility_event_router_views.cc

Index: chrome/browser/ui/views/accessibility_event_router_views.cc
diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc
index 34fb85e5432977f2818036a44098d8b9b54adc7c..e8c815b0035c9c9d788de870f5df958aa26ffcd0 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views.cc
@@ -10,6 +10,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
@@ -47,11 +48,6 @@ AccessibilityEventRouterViews* AccessibilityEventRouterViews::GetInstance() {
 
 void AccessibilityEventRouterViews::HandleAccessibilityEvent(
     views::View* view, ui::AccessibilityTypes::Event event_type) {
-  if (!ExtensionAccessibilityEventRouter::GetInstance()->
-      IsAccessibilityEnabled()) {
-    return;
-  }
-
   switch (event_type) {
     case ui::AccessibilityTypes::EVENT_FOCUS:
       DispatchAccessibilityNotification(
@@ -92,13 +88,13 @@ void AccessibilityEventRouterViews::HandleMenuItemFocused(
     int item_index,
     int item_count,
     bool has_submenu) {
-  if (!ExtensionAccessibilityEventRouter::GetInstance()->
-      IsAccessibilityEnabled()) {
+  if (!most_recent_profile_)
     return;
-  }
 
-  if (!most_recent_profile_)
+  if (!most_recent_profile_->GetExtensionService()->
+      accessibility_event_router()->IsAccessibilityEnabled()) {
     return;
+  }
 
   AccessibilityMenuItemInfo info(
       most_recent_profile_,
@@ -141,6 +137,11 @@ void AccessibilityEventRouterViews::DispatchAccessibilityNotification(
     return;
   }
 
+  if (!profile->GetExtensionService()->accessibility_event_router()->
+      IsAccessibilityEnabled()) {
+    return;
+  }
+
   most_recent_profile_ = profile;
   std::string class_name = view->GetClassName();
 
@@ -294,4 +295,3 @@ void AccessibilityEventRouterViews::SendCheckboxNotification(
       profile, name, state.state == ui::AccessibilityTypes::STATE_CHECKED);
   SendAccessibilityNotification(type, &info);
 }
-