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

chrome/browser/ui/views/accessibility_event_router_views_unittest.cc

Index: chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index c288e91bbc34edcb26fd59d125eec2824adff2cc..6ff9399e8d788d5ce886a9a67c0542a955881b7a 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -8,6 +8,8 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/ui/views/accessibility_event_router_views.h"
 #include "chrome/test/testing_profile.h"
 #include "content/common/notification_registrar.h"
@@ -143,6 +145,15 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
   // Put the view in a window.
   views::Window* window = CreateWindowWithContents(contents);
 
+  // Create a profile and associate it with this window.
+  TestingProfile profile;
+  window->AsWidget()->native_widget()->SetNativeWindowProperty(
+      Profile::kProfileKey, &profile);
+
+  // To begin with, accessibility event notifications are off.
+  AccessibilityEventRouterViews::GetInstance()->
+      SetAccessibilityEnabledForTesting(false);
+
   // Set focus to the first button initially.
   button1->RequestFocus();
 
@@ -153,14 +164,8 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
                 NotificationService::AllSources());
 
   // Switch on accessibility event notifications.
-  ExtensionAccessibilityEventRouter* accessibility_event_router =
-      ExtensionAccessibilityEventRouter::GetInstance();
-  accessibility_event_router->SetAccessibilityEnabled(true);
-
-  // Create a profile and associate it with this window.
-  TestingProfile profile;
-  window->AsWidget()->native_widget()->SetNativeWindowProperty(
-      Profile::kProfileKey, &profile);
+  AccessibilityEventRouterViews::GetInstance()->
+      SetAccessibilityEnabledForTesting(true);
 
   // Change the accessible name of button3.
   button3->SetAccessibleName(ASCIIToUTF16(kButton3NewASCII));