Fix flaky SitePerProcessBrowserTest.SurfaceHitTestTest test.

content/browser/site_per_process_browsertest.cc

Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 012b9156a7164a1af7cc034eb4718d5cb55ba329..b2a23fefdba260b8711c05bdd99fe89fc8d66c5b 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -476,11 +476,9 @@ class RenderWidgetHostMouseEventMonitor {
 
 // 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
@@ -541,9 +539,11 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_SurfaceHitTestTest) {
   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
@@ -559,6 +559,14 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_SurfaceHitTestTest) {
           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);
   }