Fix primary cause of flakiness of DumpAccessibilityEvents tests on Win

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 20 matching lines @@
   for (unsigned int i = 0; i < node->InternalChildCount(); ++i) {
     BrowserAccessibility* child = node->InternalGetChild(i);
     BrowserAccessibility* result = FindNodeWithChildTreeId(child, ax_tree_id);
     if (result)
       return result;
   }
 
   return nullptr;
 }
 
-}  // namespace
-
 // 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() */,
     const ui::AXNodeData& node8 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node9 /* = ui::AXNodeData() */,
@@ skipping 137 matching lines @@
     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 if a global focus listener was set up for testing
-  // so that the test passes whether the window is active or not.
-  if (g_focus_change_callback_for_testing.Get().is_null()) {
+  // Bypass this check for some tests.
+  if (!g_never_suppress_focus_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,
   // or for the document to actually finish loading.
@@ skipping 14 matching lines @@
 
 bool BrowserAccessibilityManager::CanFireEvents() {
   return true;
 }
 
 void BrowserAccessibilityManager::FireFocusEvent(
     BrowserAccessibilityEvent::Source source,
     BrowserAccessibility* node) {
   NotifyAccessibilityEvent(source, ui::AX_EVENT_FOCUS, node);
 
-  if (!g_focus_change_callback_for_testing.Get().is_null())
+  if (g_focus_change_callback_for_testing.Get())
     g_focus_change_callback_for_testing.Get().Run();
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::GetRoot() {
   // tree_ can be null during destruction.
   if (!tree_)
     return nullptr;
 
   // tree_->root() can be null during AXTreeDelegate callbacks.
   ui::AXNode* root = tree_->root();
@@ skipping 338 matching lines @@
   data.focus_id = node->GetId();
   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::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();
   delegate_->AccessibilityPerformAction(action_data);
 }
@@ skipping 654 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