Fix flakiness in DumpAccessibilityTree tests with iframes

content/browser/accessibility/dump_accessibility_browsertest_base.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 "content/browser/accessibility/dump_accessibility_browsertest_base.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 37 matching lines @@
 const char kMarkEndOfFile[] = "<-- End-of-file -->";
 const char kSignalDiff[] = "*";
 
 // Searches recursively and returns true if an accessibility node is found
 // that represents a fully loaded web document with the given url.
 bool AccessibilityTreeContainsLoadedDocWithUrl(BrowserAccessibility* node,
                                                const std::string& url) {
   if ((node->GetRole() == ui::AX_ROLE_WEB_AREA ||
        node->GetRole() == ui::AX_ROLE_ROOT_WEB_AREA) &&
       node->GetStringAttribute(ui::AX_ATTR_URL) == url) {
-    // If possible, ensure the doc has finished loading. That's currently
-    // not possible with same-process iframes until https://crbug.com/532249
-    // is fixed.
-    return (node->manager()->GetTreeData().url != url ||
-            node->manager()->GetTreeData().loaded);
+    // Ensure the doc has finished loading.
+    return node->manager()->GetTreeData().loaded;
   }
 
   for (unsigned i = 0; i < node->PlatformChildCount(); i++) {
     if (AccessibilityTreeContainsLoadedDocWithUrl(
             node->PlatformGetChild(i), url)) {
       return true;
     }
   }
   return false;
 }
@@ skipping 190 matching lines @@
   for (FrameTreeNode* node : frame_tree->Nodes()) {
     // Ignore about:blank urls because of the case where a parent frame A
     // has a child iframe B and it writes to the document using
     // contentDocument.open() on the child frame B.
     //
     // In this scenario, B's contentWindow.location.href matches A's url,
     // but B's url in the browser frame tree is still "about:blank".
     std::string url = node->current_url().spec();
     if (url != url::kAboutBlankURL)
       all_frame_urls.push_back(url);
-
-    // We won't get the correct coordinate transformations for
-    // out-of-process iframes until each frame's surface is ready.
-    RenderFrameHostImpl* current_frame_host = node->current_frame_host();
-    if (!current_frame_host || !current_frame_host->is_local_root())
-      continue;
-    RenderWidgetHostViewBase* rwhv =
-        static_cast<RenderWidgetHostViewBase*>(current_frame_host->GetView());
-    if (rwhv && rwhv->IsChildFrameForTesting()) {
-      SurfaceHitTestReadyNotifier notifier(
-          static_cast<RenderWidgetHostViewChildFrame*>(rwhv));
-      notifier.WaitForSurfaceReady();
-    }
   }
 
   // Wait for the accessibility tree to fully load for all frames,
   // by searching for the WEB_AREA node in the accessibility tree
   // with the url of each frame in our frame tree. Note that this
   // doesn't support cases where there are two iframes with the
   // exact same url. If all frames haven't loaded yet, set up a
   // listener for accessibility events on any frame and block
   // until the next one is received.
   //
@@ skipping 96 matching lines @@
           expected_file, actual_contents.c_str(), actual_contents.size()));
       LOG(INFO) << "Wrote expectations to: "
                 << expected_file.LossyDisplayName();
     }
   } else {
     LOG(INFO) << "Test output matches expectations.";
   }
 }
 
 }  // namespace content