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"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_registrar.h"

[dmazzoni, 2013/08/14 21:00:17]

Can you delete includes of notification_registrar.h and notification_service.h
from this and all other files in this changelist now?

[Cait (Slow), 2013/08/15 20:01:16]

Some of them, yes, but not all, as some of the classes still listen or send
other notifications. 

 #include "content/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 72 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)
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
     aura_test_helper_->SetUp();
 #endif  // USE_AURA
+    EnableAccessibilityAndListenToFocusNotifications();
   }
 
   virtual void TearDown() {
+    ClearCallback();
 #if defined(USE_AURA)
     aura_test_helper_->TearDown();
 #endif
     delete views::ViewsDelegate::views_delegate;
     views::ViewsDelegate::views_delegate = NULL;
 
     // The Widget's FocusManager is deleted using DeleteSoon - this
     // forces it to be deleted now, so we don't have any memory leaks
     // when this method exits.
     base::MessageLoop::current()->RunUntilIdle();
@@ skipping 13 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() {
+    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();
+  // Handle Focus event.
+  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 15 matching lines @@
   views::LabelButton* button3 = new views::LabelButton(
       NULL, ASCIIToUTF16(kButton3ASCII));
   button3->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button3);
 
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
   window->Show();
   window->Activate();
 
-  // Set focus to the first button initially.
+  // Set focus to the first button initially and run message loop to execute
+  // callback.
   button1->RequestFocus();
-
-  EnableAccessibilityAndListenToFocusNotifications();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // 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);
   base::MessageLoop::current()->RunUntilIdle();
@@ skipping 24 matching lines @@
       ASCIIToUTF16(kToolbarNameASCII),
       ui::AccessibilityTypes::ROLE_TOOLBAR);
   views::LabelButton* button = new views::LabelButton(
       NULL, ASCIIToUTF16(kButtonNameASCII));
   button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
 
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
-  EnableAccessibilityAndListenToFocusNotifications();
-
   // Set focus to the button.
   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_);
@@ skipping 12 matching lines @@
   views::Label* label = new views::Label(ASCIIToUTF16(kAlertTextASCII));
   contents->AddChildView(label);
   views::LabelButton* button = new views::LabelButton(
       NULL, ASCIIToUTF16(kButtonNameASCII));
   button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
 
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
-  EnableAccessibilityAndListenToFocusNotifications();
-
   // Set focus to the button.
   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_);
@@ skipping 12 matching lines @@
       ui::AccessibilityTypes::ROLE_CLIENT);
   ViewWithNameAndRole* child = new ViewWithNameAndRole(
       ASCIIToUTF16(kOldNameASCII),
       ui::AccessibilityTypes::ROLE_PUSHBUTTON);
   child->set_focusable(true);
   contents->AddChildView(child);
 
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
-  EnableAccessibilityAndListenToFocusNotifications();
-
   // Set focus to the child view.
   focus_event_count_ = 0;
   child->RequestFocus();
 
   // Change the child's name after the focus notification.
   child->set_name(ASCIIToUTF16(kNewNameASCII));
 
   // We shouldn't get the notification right away.
   EXPECT_EQ(0, focus_event_count_);
 
@@ skipping 16 matching lines @@
       ui::AccessibilityTypes::ROLE_CLIENT);
   ViewWithNameAndRole* child = new ViewWithNameAndRole(
       ASCIIToUTF16(kNameASCII),
       ui::AccessibilityTypes::ROLE_PUSHBUTTON);
   child->set_focusable(true);
   contents->AddChildView(child);
 
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
-  EnableAccessibilityAndListenToFocusNotifications();
-
   // Set focus to the child view.
   focus_event_count_ = 0;
   child->RequestFocus();
 
   // Delete the child!
   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_);
 
   window->CloseNow();
 }