ABANDONED CL: WaitForChildFrameSurfaceReady to avoid flaky test hangs.

chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc

 // Copyright 2016 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 <algorithm>
 #include <initializer_list>
 #include <memory>
 #include <string>
 #include <vector>
 
@@ skipping 652 matching lines @@
   bool SimulateMouseMove(const gfx::Point& location_inside_web_contents) {
     gfx::Rect bounds = web_contents()->GetContainerBounds();
     return ui_test_utils::SendMouseMoveSync(
         gfx::Point(bounds.x() + location_inside_web_contents.x(),
                    bounds.y() + location_inside_web_contents.y()));
   }
 
   bool NavigateNamedFrame(const std::string& frame_name,
                           const std::string& origin,
                           const std::string& filename) {
+    LOG(ERROR) << "Navigating " << frame_name << " frame ...";
     content::RenderFrameHost* frame = GetFrameByName(frame_name);
     if (!frame)
       return false;
 
     std::string script;
     int response = 0;
 
     // Navigate the frame and wait for the load event.
     script = base::StringPrintf(
         "location.href = '/cross-site/%s/drag_and_drop/%s';\n"
         "setTimeout(function() { domAutomationController.send(42); }, 0);",
         origin.c_str(), filename.c_str());
     content::TestFrameNavigationObserver observer(frame);
     if (!content::ExecuteScriptAndExtractInt(frame, script, &response))
       return false;
     if (response != 42)
       return false;
     observer.Wait();
 
     // |frame| might have been swapped-out during a cross-site navigation,
     // therefore we need to get the current RenderFrameHost to work against
     // going forward.
     frame = GetFrameByName(frame_name);
     DCHECK(frame);
 
-    // Wait until frame contents (e.g. images) have painted (which should happen
-    // in the animation frame that *starts* after the onload event - therefore
-    // we need to wait for 2 animation frames).
-    script = std::string(
-        "requestAnimationFrame(function() {\n"
-        "  requestAnimationFrame(function() {\n"
-        "    domAutomationController.send(43);\n"
-        "  });\n"
-        "});\n");
-    if (!content::ExecuteScriptAndExtractInt(frame, script, &response))
-      return false;
-    if (response != 43)
-      return false;
+    // Wait until frame contents have painted and are ready for hit testing.
+    WaitForChildFrameSurfaceReady(frame);
 
+    LOG(ERROR) << "Navigating " << frame_name << " frame ... done.";
     return true;
   }
 
   content::RenderFrameHost* GetFrameByName(const std::string& name_to_find) {
     content::RenderFrameHost* result = nullptr;
     for (content::RenderFrameHost* rfh : web_contents()->GetAllFrames()) {
       if (rfh->GetFrameName() == name_to_find) {
         if (result) {
           ADD_FAILURE() << "More than one frame named "
                         << "'" << name_to_find << "'";
@@ skipping 562 matching lines @@
 // of a drag operation, and cross-site drags should be allowed across a
 // navigation.
 
 INSTANTIATE_TEST_CASE_P(
     SameSiteSubframe, DragAndDropBrowserTest, ::testing::Values(false));
 
 INSTANTIATE_TEST_CASE_P(
     CrossSiteSubframe, DragAndDropBrowserTest, ::testing::Values(true));
 
 }  // namespace chrome