Fix touch accessibility events in WebViews and iframes

content/browser/accessibility/site_per_process_accessibility_browsertest.cc

 // Copyright (c) 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/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "content/browser/accessibility/accessibility_test_utils.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_per_process_browsertest.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 17 matching lines @@
 #if defined(OS_ANDROID)
 #define MAYBE_SitePerProcessAccessibilityBrowserTest \
     DISABLED_SitePerProcessAccessibilityBrowserTest
 #else
 #define MAYBE_SitePerProcessAccessibilityBrowserTest \
     SitePerProcessAccessibilityBrowserTest
 #endif
 
 namespace content {
 
-namespace {
-
-// Searches recursively and returns true if any node's accessible name
-// is equal to the given text.
-bool AccessibilityTreeContainsText(BrowserAccessibility* node,
-                                   const std::string& text) {
-  if (node->GetStringAttribute(ui::AX_ATTR_NAME) == text)
-    return true;
-  for (unsigned i = 0; i < node->PlatformChildCount(); i++) {
-    if (AccessibilityTreeContainsText(node->PlatformGetChild(i), text))
-      return true;
-  }
-  return false;
-}
-
-}  // namespace
-
 class MAYBE_SitePerProcessAccessibilityBrowserTest
     : public SitePerProcessBrowserTest {
  public:
   MAYBE_SitePerProcessAccessibilityBrowserTest() {}
 
   void LoadCrossSitePageIntoFrame(FrameTreeNode* frame_tree_node,
                                   const std::string& relative_url,
                                   const std::string& host) {
     // Load cross-site page into iframe.
     RenderFrameHostImpl* child_rfh =
         frame_tree_node->render_manager()->current_frame_host();
     RenderFrameDeletedObserver deleted_observer(child_rfh);
     GURL cross_site_url(embedded_test_server()->GetURL(host, relative_url));
     NavigateFrameToURL(frame_tree_node, cross_site_url);
 
     // Ensure that we have created a new process for the subframe.
     SiteInstance* site_instance =
         frame_tree_node->current_frame_host()->GetSiteInstance();
     EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site_instance);
 
     // Wait until the iframe completes the swap.
     deleted_observer.WaitUntilDeleted();
   }
-
-  // This is intended to be a robust way to assert that the accessibility
-  // tree eventually gets into the correct state, without worrying about
-  // the exact ordering of events received while getting there.
-  //
-  // Searches the accessibility tree to see if any node's accessible name
-  // is equal to the given text. If not, sets up a notification waiter
-  // that listens for any accessibility event in any frame, and checks again
-  // after each event. Keeps looping until the text is found (or the
-  // test times out).
-  void WaitForAccessibilityTreeToContainText(const std::string& text) {
-    RenderFrameHostImpl* main_frame = static_cast<RenderFrameHostImpl*>(
-        shell()->web_contents()->GetMainFrame());
-    BrowserAccessibilityManager* main_frame_manager =
-        main_frame->browser_accessibility_manager();
-    FrameTree* frame_tree =
-        static_cast<WebContentsImpl*>(shell()->web_contents())->GetFrameTree();
-    while (!AccessibilityTreeContainsText(
-               main_frame_manager->GetRoot(), text)) {
-      AccessibilityNotificationWaiter accessibility_waiter(main_frame,
-                                                           ui::AX_EVENT_NONE);
-      for (FrameTreeNode* node : frame_tree->Nodes())
-        accessibility_waiter.ListenToAdditionalFrame(
-            node->current_frame_host());
-
-      accessibility_waiter.WaitForNotification();
-    }
-  }
 };
 
 IN_PROC_BROWSER_TEST_F(MAYBE_SitePerProcessAccessibilityBrowserTest,
                        CrossSiteIframeAccessibility) {
   // Enable full accessibility for all current and future WebContents.
   BrowserAccessibilityState::GetInstance()->EnableAccessibility();
 
   GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html"));
   NavigateToURL(shell(), main_url);
 
   // It is safe to obtain the root frame tree node here, as it doesn't change.
   FrameTreeNode* root =
       static_cast<WebContentsImpl*>(shell()->web_contents())->
           GetFrameTree()->root();
 
   // Load same-site page into iframe.
   FrameTreeNode* child = root->child_at(0);
   GURL http_url(embedded_test_server()->GetURL("/title1.html"));
   NavigateFrameToURL(child, http_url);
 
   // Load cross-site page into iframe and wait for text from that
   // page to appear in the accessibility tree.
   LoadCrossSitePageIntoFrame(child, "/title2.html", "foo.com");
-  WaitForAccessibilityTreeToContainText("Title Of Awesomeness");
+  WaitForAccessibilityTreeToContainNodeWithName(
+      shell()->web_contents(),
+      "Title Of Awesomeness");
 
   RenderFrameHostImpl* main_frame = static_cast<RenderFrameHostImpl*>(
       shell()->web_contents()->GetMainFrame());
   BrowserAccessibilityManager* main_frame_manager =
       main_frame->browser_accessibility_manager();
   VLOG(1) << "Main frame accessibility tree:\n"
           << main_frame_manager->SnapshotAXTreeForTesting().ToString();
 
   // Assert that we can walk from the main frame down into the child frame
   // directly, getting correct roles and data along the way.
@@ skipping 39 matching lines @@
 
   // It is safe to obtain the root frame tree node here, as it doesn't change.
   FrameTreeNode* root =
       static_cast<WebContentsImpl*>(shell()->web_contents())->
           GetFrameTree()->root();
 
   // Load first cross-site page into iframe and wait for text from that
   // page to appear in the accessibility tree.
   FrameTreeNode* child = root->child_at(0);
   LoadCrossSitePageIntoFrame(child, "/title1.html", "foo.com");
-  WaitForAccessibilityTreeToContainText("This page has no title.");
+  WaitForAccessibilityTreeToContainNodeWithName(
+      shell()->web_contents(),
+      "This page has no title.");
 
   // Load second cross-site page into iframe and wait for text from that
   // page to appear in the accessibility tree. If this succeeds and doesn't
   // time out, the test passes.
   LoadCrossSitePageIntoFrame(child, "/title2.html", "bar.com");
-  WaitForAccessibilityTreeToContainText("Title Of Awesomeness");
+  WaitForAccessibilityTreeToContainNodeWithName(
+      shell()->web_contents(),
+      "Title Of Awesomeness");
 }
 
 }  // namespace content