Fix DumpAccessibilityEvents tests on Mac and improve test coverage

content/browser/accessibility/browser_accessibility_manager.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 "content/browser/accessibility/browser_accessibility_manager.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 30 matching lines @@
 // Map from AXTreeID to BrowserAccessibilityManager
 using AXTreeIDMap = base::hash_map<ui::AXTreeIDRegistry::AXTreeID,
                                    BrowserAccessibilityManager*>;
 base::LazyInstance<AXTreeIDMap>::DestructorAtExit g_ax_tree_id_map =
     LAZY_INSTANCE_INITIALIZER;
 
 // A function to call when focus changes, for testing only.
 base::LazyInstance<base::Closure>::DestructorAtExit
     g_focus_change_callback_for_testing = LAZY_INSTANCE_INITIALIZER;
 
-// A flag for use in tests to ensure focus events aren't suppressed.
-bool g_never_suppress_focus_events_for_testing = false;
-
 }  // namespace
 
 ui::AXTreeUpdate MakeAXTreeUpdate(
     const ui::AXNodeData& node1,
     const ui::AXNodeData& node2 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node3 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node4 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node5 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node6 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node7 /* = ui::AXNodeData() */,
@@ skipping 116 matching lines @@
   if (!tree_->Unserialize(initial_tree)) {
     if (delegate_) {
       LOG(ERROR) << tree_->error();
       delegate_->AccessibilityFatalError();
     } else {
       LOG(FATAL) << tree_->error();
     }
   }
 }
 
+// A flag for use in tests to ensure events aren't suppressed or delayed.
+// static
+bool BrowserAccessibilityManager::never_suppress_or_delay_events_for_testing_ =
+    false;
+
 // static
 ui::AXTreeUpdate
 BrowserAccessibilityManager::GetEmptyDocument() {
   ui::AXNodeData empty_document;
   empty_document.id = 0;
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
   ui::AXTreeUpdate update;
   update.nodes.push_back(empty_document);
   return update;
 }
 
 void BrowserAccessibilityManager::NotifyAccessibilityEvent(
     BrowserAccessibilityEvent::Source source,
     ui::AXEvent event_type,
     BrowserAccessibility* node) {
   BrowserAccessibilityEvent::Create(source, event_type, node)->Fire();
 }
 
 void BrowserAccessibilityManager::FireFocusEventsIfNeeded(
     BrowserAccessibilityEvent::Source source) {
   BrowserAccessibility* focus = GetFocus();
 
   // Don't fire focus events if the window itself doesn't have focus.
   // Bypass this check for some tests.
-  if (!g_never_suppress_focus_events_for_testing &&
+  if (!never_suppress_or_delay_events_for_testing_ &&
       !g_focus_change_callback_for_testing.Get()) {
     if (delegate_ && !delegate_->AccessibilityViewHasFocus())
       focus = nullptr;
 
     if (!CanFireEvents())
       focus = nullptr;
   }
 
   // Don't allow the document to be focused if it has no children and
   // hasn't finished loading yet. Wait for at least a tiny bit of content,
@@ skipping 385 matching lines @@
   tree_->UpdateData(data);
 }
 
 // static
 void BrowserAccessibilityManager::SetFocusChangeCallbackForTesting(
     const base::Closure& callback) {
   g_focus_change_callback_for_testing.Get() = callback;
 }
 
 // static
-void BrowserAccessibilityManager::NeverSuppressFocusEventsForTesting() {
-  g_never_suppress_focus_events_for_testing = true;
+void BrowserAccessibilityManager::NeverSuppressOrDelayEventsForTesting() {
+  never_suppress_or_delay_events_for_testing_ = true;
 }
 
 void BrowserAccessibilityManager::Decrement(
     const BrowserAccessibility& node) {
   if (!delegate_)
     return;
 
   ui::AXActionData action_data;
   action_data.action = ui::AX_ACTION_DECREMENT;
   action_data.target_node_id = node.GetId();
@@ skipping 656 matching lines @@
       hit_test_result = parent;
     parent = parent->PlatformGetParent();
   }
 
   last_hover_ax_tree_id_ = hit_test_result->manager()->ax_tree_id();
   last_hover_node_id_ = hit_test_result->GetId();
   last_hover_bounds_ = hit_test_result->GetScreenBoundsRect();
 }
 
 }  // namespace content