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

chrome/browser/ui/views/accessibility_event_router_views_unittest.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 <string>
 
 #include "base/message_loop.h"
 #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"
 #include "content/common/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/button/native_button.h"
 #include "views/layout/grid_layout.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
@@ skipping 115 matching lines @@
   views::NativeButton* button2 = new views::NativeButton(
       NULL, ASCIIToWide(kButton2ASCII));
   contents->AddChildView(button2);
   views::NativeButton* button3 = new views::NativeButton(
       NULL, ASCIIToWide(kButton3ASCII));
   contents->AddChildView(button3);
 
   // 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();
 
   // Start listening to ACCESSIBILITY_CONTROL_FOCUSED notifications.
   NotificationRegistrar registrar;
   registrar.Add(this,
                 NotificationType::ACCESSIBILITY_CONTROL_FOCUSED,
                 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));
 
   // Advance focus to the next button and test that we got the
   // expected notification with the name of button 2.
   views::FocusManager* focus_manager = contents->GetWidget()->GetFocusManager();
   focus_event_count_ = 0;
   focus_manager->AdvanceFocus(false);
   EXPECT_EQ(1, focus_event_count_);
   EXPECT_EQ(kButton2ASCII, last_control_name_);
 
   // Advance to button 3. Expect the new accessible name we assigned.
   focus_manager->AdvanceFocus(false);
   EXPECT_EQ(2, focus_event_count_);
   EXPECT_EQ(kButton3NewASCII, last_control_name_);
 
   // Advance to button 1 and check the notification.
   focus_manager->AdvanceFocus(false);
   EXPECT_EQ(3, focus_event_count_);
   EXPECT_EQ(kButton1ASCII, last_control_name_);
 }
 
 #endif  // defined(TOOLKIT_VIEWS)