Fix touch accessibility events in WebViews and iframes

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 <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/browser/accessibility/accessibility_test_utils.h"
 #include "content/browser/accessibility/accessibility_tree_formatter.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/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_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 {
 
-namespace {
-
-bool AXTreeContainsNodeWithName(BrowserAccessibility* node,
-                                const std::string& name) {
-  if (node->GetStringAttribute(ui::AX_ATTR_NAME) == name)
-    return true;
-
-  for (unsigned i = 0; i < node->PlatformChildCount(); i++) {
-    if (AXTreeContainsNodeWithName(node->PlatformGetChild(i), name))
-      return true;
-  }
-
-  return false;
-}
-
-}  // namespace
-
 class AccessibilityHitTestingBrowserTest : public ContentBrowserTest {
  public:
   AccessibilityHitTestingBrowserTest() {}
   ~AccessibilityHitTestingBrowserTest() override {}
 
  protected:
   BrowserAccessibility* HitTestAndWaitForResult(const gfx::Point& point) {
     WebContentsImpl* web_contents =
         static_cast<WebContentsImpl*>(shell()->web_contents());
     FrameTree* frame_tree = web_contents->GetFrameTree();
@@ skipping 50 matching lines @@
 
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   AccessibilityNotificationWaiter waiter(shell(), AccessibilityModeComplete,
                                          ui::AX_EVENT_LOAD_COMPLETE);
   GURL url(embedded_test_server()->GetURL(
       "/accessibility/html/iframe-coordinates.html"));
   NavigateToURL(shell(), url);
   waiter.WaitForNotification();
 
-  WebContentsImpl* web_contents =
-      static_cast<WebContentsImpl*>(shell()->web_contents());
-  FrameTree* frame_tree = web_contents->GetFrameTree();
-  BrowserAccessibilityManager* manager =
-      web_contents->GetRootBrowserAccessibilityManager();
-  BrowserAccessibility* root = manager->GetRoot();
-  while (!AXTreeContainsNodeWithName(root, "Ordinary Button") ||
-         !AXTreeContainsNodeWithName(root, "Scrolled Button")) {
-    AccessibilityNotificationWaiter waiter(shell(), AccessibilityModeComplete,
-                                           ui::AX_EVENT_NONE);
-    for (FrameTreeNode* node : frame_tree->Nodes())
-      waiter.ListenToAdditionalFrame(node->current_frame_host());
-    waiter.WaitForNotification();
-  }
+  WaitForAccessibilityTreeToContainNodeWithName(
+      shell()->web_contents(), "Ordinary Button");
+  WaitForAccessibilityTreeToContainNodeWithName(
+      shell()->web_contents(), "Scrolled Button");
 
   // Send a series of hit test requests, and for each one
   // wait for the hover event in response, verifying we hit the
   // correct object.
 
   // (50, 50) -> "Button"
   BrowserAccessibility* hovered_node;
   hovered_node = HitTestAndWaitForResult(gfx::Point(50, 50));
   ASSERT_TRUE(hovered_node != NULL);
   ASSERT_EQ(ui::AX_ROLE_BUTTON, hovered_node->GetRole());
@@ skipping 18 matching lines @@
   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());
 }
 
 }  // namespace content