Fix flaky SitePerProcessBrowserTest.SurfaceHitTestTest test.

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 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/site_per_process_browsertest.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 458 matching lines @@
     event_ = event;
     return false;
   }
   RenderWidgetHost* host_;
   bool event_received;
   blink::WebMouseEvent event_;
 };
 
 // Test that mouse events are being routed to the correct RenderWidgetHostView
 // based on coordinates.
-#if defined(OS_ANDROID) || defined(THREAD_SANITIZER) || defined(OS_LINUX)
+#if defined(OS_ANDROID)
 // Browser process hit testing is not implemented on Android.
 // https://crbug.com/491334
-// Test fails under TSAN, see https://crbug.com/527618
-// Test is flaky under Linux, see https://crbug.com/528189
 #define MAYBE_SurfaceHitTestTest DISABLED_SurfaceHitTestTest
 #else
 #define MAYBE_SurfaceHitTestTest SurfaceHitTestTest
 #endif
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_SurfaceHitTestTest) {
   if (!UseSurfacesEnabled())
     return;
 
   GURL main_url(embedded_test_server()->GetURL(
       "/frame_tree/page_with_positioned_frame.html"));
@@ skipping 40 matching lines @@
 
   uint32_t cur_render_frame_number = root_view->RendererFrameNumber();
 
   // Target input event to child frame.
   blink::WebMouseEvent child_event;
   child_event.type = blink::WebInputEvent::MouseDown;
   child_event.button = blink::WebPointerProperties::ButtonLeft;
   child_event.x = 75;
   child_event.y = 75;
   child_event.clickCount = 1;
+  main_frame_monitor.ResetEventReceived();
+  child_frame_monitor.ResetEventReceived();
   router->RouteMouseEvent(root_view, &child_event);
 
-  if (!child_frame_monitor.EventWasReceived()) {
+  while (!child_frame_monitor.EventWasReceived()) {
     main_frame_monitor.ResetEventReceived();
     // This is working around a big synchronization problem. It is very
     // difficult to know if we have received a compositor frame from the
     // main frame renderer *after* it received the child frame's surface
     // ID. Hit testing won't work until this happens. So if the hit test
     // fails then we wait for another frame to arrive and try again.
     // TODO(kenrb): We need a better way to do all of this, possibly coming
     // from http://crbug.com/405282.
     while (root_view->RendererFrameNumber() <= cur_render_frame_number) {
       base::RunLoop run_loop;
       base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE, run_loop.QuitClosure(),
           base::TimeDelta::FromMilliseconds(10));
       run_loop.Run();
     }
+    cur_render_frame_number = root_view->RendererFrameNumber();
+    child_event.type = blink::WebInputEvent::MouseDown;
+    child_event.button = blink::WebPointerProperties::ButtonLeft;
+    child_event.x = 75;
+    child_event.y = 75;
+    child_event.clickCount = 1;
+    main_frame_monitor.ResetEventReceived();

[kenrb, 2015/10/22 17:17:47]

Can we remove the reset on line 547? These two seem redundant.

[lfg, 2015/10/22 17:20:44]

Done.

+    child_frame_monitor.ResetEventReceived();
     router->RouteMouseEvent(root_view, &child_event);
   }
 
   EXPECT_TRUE(child_frame_monitor.EventWasReceived());
   EXPECT_EQ(23, child_frame_monitor.event().x);
   EXPECT_EQ(23, child_frame_monitor.event().y);
   EXPECT_FALSE(main_frame_monitor.EventWasReceived());
 
   child_frame_monitor.ResetEventReceived();
   main_frame_monitor.ResetEventReceived();
@@ skipping 3020 matching lines @@
 
   // CursorMessageFilter::Wait() implicitly tests whether we receive a
   // ViewHostMsg_SetCursor message from the renderer process, because it does
   // does not return otherwise.
   filter->Wait();
   EXPECT_EQ(filter->last_set_cursor_routing_id(), rwh_child->GetRoutingID());
 }
 #endif
 
 }  // namespace content