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

This breaks, among other things, multi-profile and the first run dialog.
Reverting at least for M13.

This reverts commit 45758c29485736d7164085e6b7f8bf0999df1c4f.

BUG=81745
TEST=none

Review URL: http://codereview.chromium.org/7084006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87083 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 25 deletions

diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc
index 58aa6aa..34fb85e 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views.cc
@@ -10,7 +10,6 @@
 #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"
@@ -35,9 +34,7 @@ using views::FocusManager;
 
 AccessibilityEventRouterViews::AccessibilityEventRouterViews()
     : most_recent_profile_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
-      accessibility_enabled_overridden_for_testing_(false),
-      accessibility_enabled_override_value_(false) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 AccessibilityEventRouterViews::~AccessibilityEventRouterViews() {
@@ -50,6 +47,11 @@ 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(
@@ -90,12 +92,13 @@ void AccessibilityEventRouterViews::HandleMenuItemFocused(
     int item_index,
     int item_count,
     bool has_submenu) {
-  if (!most_recent_profile_)
+  if (!ExtensionAccessibilityEventRouter::GetInstance()->
+      IsAccessibilityEnabled()) {
     return;
+  }
 
-  if (!IsAccessibilityEnabled(most_recent_profile_)) {
+  if (!most_recent_profile_)
     return;
-  }
 
   AccessibilityMenuItemInfo info(
       most_recent_profile_,
@@ -111,15 +114,6 @@ void AccessibilityEventRouterViews::HandleMenuItemFocused(
 // Private methods
 //
 
-bool AccessibilityEventRouterViews::IsAccessibilityEnabled(Profile* profile) {
-  if (accessibility_enabled_overridden_for_testing_) {
-    return accessibility_enabled_override_value_;
-  }
-  DCHECK(profile);
-  return profile->GetExtensionService()->accessibility_event_router()->
-      IsAccessibilityEnabled();
-}
-
 std::string AccessibilityEventRouterViews::GetViewName(views::View* view) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
@@ -147,10 +141,6 @@ void AccessibilityEventRouterViews::DispatchAccessibilityNotification(
     return;
   }
 
-  if (!IsAccessibilityEnabled(profile)) {
-    return;
-  }
-
   most_recent_profile_ = profile;
   std::string class_name = view->GetClassName();
 
@@ -305,8 +295,3 @@ void AccessibilityEventRouterViews::SendCheckboxNotification(
   SendAccessibilityNotification(type, &info);
 }
 
-void AccessibilityEventRouterViews::SetAccessibilityEnabledForTesting(
-    bool enabled) {
-  accessibility_enabled_overridden_for_testing_ = true;
-  accessibility_enabled_override_value_ = enabled;
-}