Use AXEventRecorder in more tests.

Extend usage of AXEventRecorder to count accessibility events in some
recently added tests.

Bug: None
Change-Id: I91824b69e772883a95de27b36deff47022f72cc3
AX-Relnotes: no user-facing changes.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372484Reviewed-by: Peter Boström <pbos@chromium.org>
Commit-Queue: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Cr-Commit-Position: refs/heads/master@{#801405}

ui/views/BUILD.gn

@@ -905,8 +905,6 @@ source_set("test_support") {
     "test/scoped_views_test_helper.h",
     "test/slider_test_api.cc",
     "test/slider_test_api.h",
-    "test/test_ax_event_observer.cc",
-    "test/test_ax_event_observer.h",
     "test/test_layout_manager.cc",
     "test/test_layout_manager.h",
     "test/test_layout_provider.cc",

ui/views/controls/button/button_unittest.cc

@@ -37,7 +37,7 @@
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/style/platform_style.h"
-#include "ui/views/test/test_ax_event_observer.h"
+#include "ui/views/test/ax_event_counter.h"
 #include "ui/views/test/view_metadata_test_utils.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget_utils.h"
@@ -962,10 +962,10 @@ TEST_F(ButtonTest, SetStateNotifiesObserver) {
 // Verifies setting the tooltip text will call NotifyAccessibilityEvent.
 TEST_F(ButtonTest, SetTooltipTextNotifiesAccessibilityEvent) {
   base::string16 test_tooltip_text = base::ASCIIToUTF16("Test Tooltip Text");
-  test::TestAXEventObserver observer;
-  EXPECT_EQ(0, observer.text_changed_event_count());
+  test::AXEventCounter counter(views::AXEventManager::Get());
+  EXPECT_EQ(0, counter.GetCount(ax::mojom::Event::kTextChanged));
   button()->SetTooltipText(test_tooltip_text);
-  EXPECT_EQ(1, observer.text_changed_event_count());
+  EXPECT_EQ(1, counter.GetCount(ax::mojom::Event::kTextChanged));
   EXPECT_EQ(test_tooltip_text, button()->GetTooltipText(gfx::Point()));
   ui::AXNodeData data;
   button()->GetAccessibleNodeData(&data);

ui/views/controls/combobox/combobox_unittest.cc

@@ -31,8 +31,8 @@
 #include "ui/events/types/event_type.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/style/platform_style.h"
+#include "ui/views/test/ax_event_counter.h"
 #include "ui/views/test/combobox_test_api.h"
-#include "ui/views/test/test_ax_event_observer.h"
 #include "ui/views/test/view_metadata_test_utils.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/unique_widget_ptr.h"
@@ -830,10 +830,10 @@ TEST_F(ComboboxTest, MenuModel) {
 TEST_F(ComboboxTest, SetTooltipTextNotifiesAccessibilityEvent) {
   InitCombobox(nullptr);
   base::string16 test_tooltip_text = ASCIIToUTF16("Test Tooltip Text");
-  test::TestAXEventObserver observer;
-  EXPECT_EQ(0, observer.text_changed_event_count());
+  test::AXEventCounter counter(views::AXEventManager::Get());
+  EXPECT_EQ(0, counter.GetCount(ax::mojom::Event::kTextChanged));
   combobox_->SetTooltipText(test_tooltip_text);
-  EXPECT_EQ(1, observer.text_changed_event_count());
+  EXPECT_EQ(1, counter.GetCount(ax::mojom::Event::kTextChanged));
   EXPECT_EQ(test_tooltip_text, combobox_->GetAccessibleName());
   ui::AXNodeData data;
   combobox_->GetAccessibleNodeData(&data);

ui/views/controls/image_view_unittest.cc

@@ -20,7 +20,7 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/test/test_ax_event_observer.h"
+#include "ui/views/test/ax_event_counter.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
@@ -151,10 +151,10 @@ TEST_P(ImageViewTest, ImageOriginForCustomViewBounds) {
 // Verifies setting the accessible name will be call NotifyAccessibilityEvent.
 TEST_P(ImageViewTest, SetAccessibleNameNotifiesAccessibilityEvent) {
   base::string16 test_tooltip_text = base::ASCIIToUTF16("Test Tooltip Text");
-  test::TestAXEventObserver observer;
-  EXPECT_EQ(0, observer.text_changed_event_count());
+  test::AXEventCounter counter(views::AXEventManager::Get());
+  EXPECT_EQ(0, counter.GetCount(ax::mojom::Event::kTextChanged));
   image_view()->SetAccessibleName(test_tooltip_text);
-  EXPECT_EQ(1, observer.text_changed_event_count());
+  EXPECT_EQ(1, counter.GetCount(ax::mojom::Event::kTextChanged));
   EXPECT_EQ(test_tooltip_text, image_view()->GetAccessibleName());
   ui::AXNodeData data;
   image_view()->GetAccessibleNodeData(&data);

ui/views/controls/textfield/textfield_unittest.cc

@@ -51,7 +51,7 @@
 #include "ui/views/controls/textfield/textfield_test_api.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/style/platform_style.h"
-#include "ui/views/test/test_ax_event_observer.h"
+#include "ui/views/test/ax_event_counter.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/widget_test.h"
@@ -3474,10 +3474,10 @@ TEST_F(TextfieldTest, CursorBlinkRestartsOnInsertOrReplace) {
 TEST_F(TextfieldTest, SetAccessibleNameNotifiesAccessibilityEvent) {
   InitTextfield();
   base::string16 test_tooltip_text = ASCIIToUTF16("Test Accessible Name");
-  test::TestAXEventObserver observer;
-  EXPECT_EQ(0, observer.text_changed_event_count());
+  test::AXEventCounter counter(views::AXEventManager::Get());
+  EXPECT_EQ(0, counter.GetCount(ax::mojom::Event::kTextChanged));
   textfield_->SetAccessibleName(test_tooltip_text);
-  EXPECT_EQ(1, observer.text_changed_event_count());
+  EXPECT_EQ(1, counter.GetCount(ax::mojom::Event::kTextChanged));
   EXPECT_EQ(test_tooltip_text, textfield_->GetAccessibleName());
   ui::AXNodeData data;
   textfield_->GetAccessibleNodeData(&data);

ui/views/test/test_ax_event_observer.cc

-// Copyright 2020 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 "ui/views/test/test_ax_event_observer.h"
-
-#include "ui/accessibility/ax_enums.mojom.h"
-#include "ui/views/accessibility/ax_event_manager.h"
-#include "ui/views/accessibility/ax_event_observer.h"
-
-namespace views {
-namespace test {
-
-TestAXEventObserver::TestAXEventObserver() {
-  AXEventManager::Get()->AddObserver(this);
-}
-
-TestAXEventObserver::~TestAXEventObserver() {
-  AXEventManager::Get()->RemoveObserver(this);
-}
-
-void TestAXEventObserver::OnViewEvent(View* view, ax::mojom::Event event_type) {
-  if (event_type == ax::mojom::Event::kTextChanged)
-    ++text_changed_event_count_;
-}
-
-}  // namespace test
-}  // namespace views

ui/views/test/test_ax_event_observer.h

-// Copyright 2020 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.
-
-#ifndef UI_VIEWS_TEST_TEST_AX_EVENT_OBSERVER_H_
-#define UI_VIEWS_TEST_TEST_AX_EVENT_OBSERVER_H_
-
-#include "ui/views/accessibility/ax_event_observer.h"
-
-namespace views {
-namespace test {
-
-// Observes all Views accessibility events for tests.
-class TestAXEventObserver : public AXEventObserver {
- public:
-  TestAXEventObserver();
-  TestAXEventObserver(const TestAXEventObserver&) = delete;
-  TestAXEventObserver& operator=(const TestAXEventObserver&) = delete;
-  ~TestAXEventObserver() override;
-
-  // AXEventObserver:
-  void OnViewEvent(View* view, ax::mojom::Event event_type) override;
-
-  int text_changed_event_count() const { return text_changed_event_count_; }
-
- private:
-  int text_changed_event_count_ = 0;
-};
-
-}  // namespace test
-}  // namespace views
-
-#endif  // UI_VIEWS_TEST_TEST_AX_EVENT_OBSERVER_H_