Remove notifications from Accessibility API

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

 // Copyright (c) 2012 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/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 86 matching lines @@
 
   void set_name(const string16& name) { name_ = name; }
 
  private:
   string16 name_;
   ui::AccessibilityTypes::Role role_;
   DISALLOW_COPY_AND_ASSIGN(ViewWithNameAndRole);
 };
 
 class AccessibilityEventRouterViewsTest
-    : public testing::Test,
-      public content::NotificationObserver {
+    : public testing::Test {
  public:
   AccessibilityEventRouterViewsTest() {
   }
 
   virtual void SetUp() {
 #if defined(OS_WIN)
     ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
@@ skipping 29 matching lines @@
         context,
         gfx::Rect(0, 0, 500, 500));
 
     // Create a profile and associate it with this window.
     widget->SetNativeWindowProperty(Profile::kProfileKey, &profile_);
 
     return widget;
   }
 
   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();
   }
 
   base::MessageLoopForUI message_loop_;
   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_;
 #endif
 #if defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
 };
 
 TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
@@ skipping 44 matching lines @@
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(2, focus_event_count_);
   EXPECT_EQ(kButton3NewASCII, last_control_name_);
 
   // Advance to button 1 and check the notification.
   focus_manager->AdvanceFocus(false);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(3, focus_event_count_);
   EXPECT_EQ(kButton1ASCII, last_control_name_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, TestToolbarContext) {
   const char kToolbarNameASCII[] = "MyToolbar";
   const char kButtonNameASCII[] = "MyButton";
 
   // Create a toolbar with a button.
   views::View* contents = new ViewWithNameAndRole(
       ASCIIToUTF16(kToolbarNameASCII),
@@ skipping 12 matching lines @@
   focus_event_count_ = 0;
   button->RequestFocus();
 
   base::MessageLoop::current()->RunUntilIdle();
 
   // Test that we got the event with the expected name and context.
   EXPECT_EQ(kInitialFocusCount, focus_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kToolbarNameASCII, last_control_context_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, TestAlertContext) {
   const char kAlertTextASCII[] = "MyAlertText";
   const char kButtonNameASCII[] = "MyButton";
 
   // Create an alert with static text and a button, similar to an infobar.
   views::View* contents = new ViewWithNameAndRole(
       string16(),
@@ skipping 14 matching lines @@
   focus_event_count_ = 0;
   button->RequestFocus();
 
   base::MessageLoop::current()->RunUntilIdle();
 
   // Test that we got the event with the expected name and context.
   EXPECT_EQ(kInitialFocusCount, focus_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kAlertTextASCII, last_control_context_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, StateChangeAfterNotification) {
   const char kContentsNameASCII[] = "Contents";
   const char kOldNameASCII[] = "OldName";
   const char kNewNameASCII[] = "NewName";
 
   // Create a toolbar with a button.
   views::View* contents = new ViewWithNameAndRole(
@@ skipping 19 matching lines @@
 
   // We shouldn't get the notification right away.
   EXPECT_EQ(0, focus_event_count_);
 
   // Process anything in the event loop. Now we should get the notification,
   // and it should give us the new control name, not the old one.
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kInitialFocusCount, focus_event_count_);
   EXPECT_EQ(kNewNameASCII, last_control_name_);
 
+  ClearCallback();
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, NotificationOnDeletedObject) {
   const char kContentsNameASCII[] = "Contents";
   const char kNameASCII[] = "OldName";
 
   // Create a toolbar with a button.
   views::View* contents = new ViewWithNameAndRole(
       ASCIIToUTF16(kContentsNameASCII),
@@ skipping 17 matching lines @@
   delete child;
 
   // We shouldn't get the notification right away.
   EXPECT_EQ(0, focus_event_count_);
 
   // Process anything in the event loop. We shouldn't get a notification
   // because the view is no longer valid, and this shouldn't crash.
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(0, focus_event_count_);
 
+  ClearCallback();
   window->CloseNow();
 }