Fix flakiness in DragAndDropBrowserTests

content/browser/accessibility/touch_accessibility_aura_browsertest.cc

 // Copyright 2015 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/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 153 matching lines @@
       shell()->web_contents()->GetMainFrame());
   RenderFrameHostImpl* child_frame =
       main_frame->frame_tree_node()->child_at(0)->current_frame_host();
   BrowserAccessibilityManager* child_manager =
       child_frame->GetOrCreateBrowserAccessibilityManager();
   ASSERT_NE(nullptr, child_manager);
 
   // If OOPIFs are enabled, wait until compositor frames are all properly
   // displayed, otherwise the touch event will not get sent to the correct
   // renderer process.
-  if (main_frame->GetView() != child_frame->GetView()) {
-    SurfaceHitTestReadyNotifier notifier(
-        static_cast<RenderWidgetHostViewChildFrame*>(child_frame->GetView()));
-    notifier.WaitForSurfaceReady();
-  }
+  WaitForChildFrameSurfaceReady(child_frame);
 
   // Send a touch exploration event to the button in the first iframe.
   // A touch exploration event is just a mouse move event with
   // the ui::EF_TOUCH_ACCESSIBILITY flag set.
   AccessibilityNotificationWaiter waiter(
       child_frame, ui::AX_EVENT_HOVER);
   SendTouchExplorationEvent(50, 350);
   waiter.WaitForNotification();
   int target_id = waiter.event_target_id();
   BrowserAccessibility* hit = child_manager->GetFromID(target_id);
   EXPECT_EQ(ui::AX_ROLE_BUTTON, hit->GetData().role);
   std::string text = hit->GetData().GetStringAttribute(ui::AX_ATTR_NAME);
   EXPECT_EQ("Ordinary Button", text);
 }
 
 }  // namespace content