Remove notifications from Accessibility API

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc

Index: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
index 710eb9e348772d85eb07df7f05c3ec0234116adb..c6443cb647fc3b14a47c454ae4edf3c803402c18 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -104,8 +104,7 @@ class ViewWithNameAndRole : public views::View {
 };
 
 class AccessibilityEventRouterViewsTest
-    : public testing::Test,
-      public content::NotificationObserver {
+    : public testing::Test {
  public:
   AccessibilityEventRouterViewsTest() {
   }
@@ -155,25 +154,27 @@ class AccessibilityEventRouterViewsTest
   }
 
   void EnableAccessibilityAndListenToFocusNotifications() {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
-                   content::NotificationService::AllSources());
-
     // Switch on accessibility event notifications.
     ExtensionAccessibilityEventRouter* accessibility_event_router =
         ExtensionAccessibilityEventRouter::GetInstance();
     accessibility_event_router->SetAccessibilityEnabled(true);
+    accessibility_event_router->SetControlEventCallbackForTesting(base::Bind(
+        &AccessibilityEventRouterViewsTest::OnFocusEvent,
+        base::Unretained(this)));
+  }
+
+  void ClearCallback() {

[dmazzoni, 2013/08/14 19:36:37]

Can you do this in TearDown rather than having to call it each time?

[Cait (Slow), 2013/08/14 20:53:36]

Done.

+    // Switch on accessibility event notifications.
+    ExtensionAccessibilityEventRouter* accessibility_event_router =
+        ExtensionAccessibilityEventRouter::GetInstance();
+    accessibility_event_router->ClearControlEventCallback();
   }
 
  protected:
   // Implement NotificationObserver::Observe and store information about a
   // ACCESSIBILITY_CONTROL_FOCUSED event.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
-    ASSERT_EQ(type, chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED);
-    const AccessibilityControlInfo* info =
-        content::Details<const AccessibilityControlInfo>(details).ptr();
+  virtual void OnFocusEvent(ui::AccessibilityTypes::Event event,
+                            const AccessibilityControlInfo* info) {
     focus_event_count_++;
     last_control_name_ = info->name();
     last_control_context_ = info->context();
@@ -183,7 +184,6 @@ class AccessibilityEventRouterViewsTest
   int focus_event_count_;
   std::string last_control_name_;
   std::string last_control_context_;
-  content::NotificationRegistrar registrar_;
   TestingProfile profile_;
 #if defined(OS_WIN)
   scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
@@ -248,6 +248,7 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
   EXPECT_EQ(3, focus_event_count_);
   EXPECT_EQ(kButton1ASCII, last_control_name_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
@@ -280,6 +281,7 @@ TEST_F(AccessibilityEventRouterViewsTest, TestToolbarContext) {
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kToolbarNameASCII, last_control_context_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
@@ -314,6 +316,7 @@ TEST_F(AccessibilityEventRouterViewsTest, TestAlertContext) {
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kAlertTextASCII, last_control_context_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
@@ -353,6 +356,7 @@ TEST_F(AccessibilityEventRouterViewsTest, StateChangeAfterNotification) {
   EXPECT_EQ(kInitialFocusCount, focus_event_count_);
   EXPECT_EQ(kNewNameASCII, last_control_name_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
@@ -390,5 +394,6 @@ TEST_F(AccessibilityEventRouterViewsTest, NotificationOnDeletedObject) {
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(0, focus_event_count_);
 
+  ClearCallback();
   window->CloseNow();
 }