Generalize the HIT_TEST accessibility action so that it can send any event.

content/browser/accessibility/hit_testing_browsertest.cc

 // Copyright 2014 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 "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/accessibility_browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class AccessibilityHitTestingBrowserTest : public ContentBrowserTest {
  public:
   AccessibilityHitTestingBrowserTest() {}
   ~AccessibilityHitTestingBrowserTest() override {}
 
  protected:
-  BrowserAccessibility* HitTestAndWaitForResult(const gfx::Point& point) {
+  BrowserAccessibility* HitTestAndWaitForResultWithEvent(
+      const gfx::Point& point,
+      ui::AXEvent event_to_fire) {
     WebContentsImpl* web_contents =
         static_cast<WebContentsImpl*>(shell()->web_contents());
     FrameTree* frame_tree = web_contents->GetFrameTree();
     BrowserAccessibilityManager* manager =
         web_contents->GetRootBrowserAccessibilityManager();
 
-    AccessibilityNotificationWaiter hover_waiter(
-        shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_HOVER);
+    AccessibilityNotificationWaiter event_waiter(
+        shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE, event_to_fire);
     for (FrameTreeNode* node : frame_tree->Nodes())
-      hover_waiter.ListenToAdditionalFrame(node->current_frame_host());
-    manager->HitTest(point);
-    hover_waiter.WaitForNotification();
+      event_waiter.ListenToAdditionalFrame(node->current_frame_host());
+    ui::AXActionData action_data;
+    action_data.action = ui::AX_ACTION_HIT_TEST;
+    action_data.target_point = point;
+    action_data.hit_test_event_to_fire = event_to_fire;
+    manager->delegate()->AccessibilityPerformAction(action_data);
+    event_waiter.WaitForNotification();
 
-    RenderFrameHostImpl* target_frame = hover_waiter.event_render_frame_host();
+    RenderFrameHostImpl* target_frame = event_waiter.event_render_frame_host();
     BrowserAccessibilityManager* target_manager =
         target_frame->browser_accessibility_manager();
-    int hover_target_id = hover_waiter.event_target_id();
+    int event_target_id = event_waiter.event_target_id();
     BrowserAccessibility* hovered_node =

[David Tseng, 2017/03/13 21:43:47]

nit: hit_node

[dmazzoni, 2017/03/20 05:40:39]

Done.

-        target_manager->GetFromID(hover_target_id);
+        target_manager->GetFromID(event_target_id);
     return hovered_node;
   }
 
+  BrowserAccessibility* HitTestAndWaitForResult(const gfx::Point& point) {
+    return HitTestAndWaitForResultWithEvent(point, ui::AX_EVENT_HOVER);
+  }
+
   BrowserAccessibility* CallCachingAsyncHitTest(const gfx::Point& point) {
     WebContentsImpl* web_contents =
         static_cast<WebContentsImpl*>(shell()->web_contents());
     FrameTree* frame_tree = web_contents->GetFrameTree();
     BrowserAccessibilityManager* manager =
         web_contents->GetRootBrowserAccessibilityManager();
     gfx::Point screen_point =
         point + manager->GetViewBounds().OffsetFromOrigin();
 
     // Each call to CachingAsyncHitTest results in at least one HOVER
@@ skipping 83 matching lines @@
   hovered_node = HitTestAndWaitForResult(gfx::Point(50, 455));
   ASSERT_TRUE(hovered_node != NULL);
   ASSERT_EQ(ui::AX_ROLE_BUTTON, hovered_node->GetRole());
   ASSERT_EQ("Scrolled Button",
             hovered_node->GetStringAttribute(ui::AX_ATTR_NAME));
 
   // (50, 505) -> div in second iframe
   hovered_node = HitTestAndWaitForResult(gfx::Point(50, 505));
   ASSERT_TRUE(hovered_node != NULL);
   ASSERT_EQ(ui::AX_ROLE_DIV, hovered_node->GetRole());
+
+  // (50, 505) -> div in second iframe
+  // but with a different event
+  hovered_node =
+      HitTestAndWaitForResultWithEvent(gfx::Point(50, 505), ui::AX_EVENT_ALERT);
+  ASSERT_TRUE(hovered_node != NULL);

[David Tseng, 2017/03/13 21:43:47]

nit: ASSERT_NE

[dmazzoni, 2017/03/20 05:40:39]

Done.

+  ASSERT_EQ(ui::AX_ROLE_DIV, hovered_node->GetRole());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
                        CachingAsyncHitTestingInIframes) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
 
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   AccessibilityNotificationWaiter waiter(shell()->web_contents(),
@@ skipping 51 matching lines @@
 
   // (50, 505) -> div in second iframe
   hovered_node = CallCachingAsyncHitTest(gfx::Point(50, 505));
   ASSERT_TRUE(hovered_node != NULL);
   ASSERT_NE(ui::AX_ROLE_DIV, hovered_node->GetRole());
   hovered_node = CallCachingAsyncHitTest(gfx::Point(50, 505));
   ASSERT_EQ(ui::AX_ROLE_DIV, hovered_node->GetRole());
 }
 
 }  // namespace content