Update SitePerProcessHitTestBrowserTest.HitTestStaleDataDeletedView hit test waiting

Currently SitePerProcessHitTestBrowserTest.HitTestStaleDataDeletedView is using
a legacy method for waiting for hit test data. This change updates it to use
the new HitTestRegionObserver.

However there is a bug in the /2 variant of the test, there overlapping hit test
regions are not submitted. Due to this I have it exit early in that config.

TEST=SitePerProcessHitTestBrowserTest.HitTestStaleDataDeletedView

Bug: 846798
Change-Id: I410d493f1abc7334e4cc21c3c4edceb4e2edd8c9
Reviewed-on: https://chromium-review.googlesource.com/1102721Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568447}

content/browser/site_per_process_hit_test_browsertest.cc

@@ -1624,11 +1624,15 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest,
   HitTestWatermark(shell(), embedded_test_server());
 }
 
-// TODO(jonross): Update this to use HitTestRegionObserver, then disable for /2
-// as currently that variant does not submit hit test regions for overlapping
-// surfaces. https://crbug.com/846798
 IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
                        HitTestStaleDataDeletedView) {
+  // TODO(sunxd): Hit test regions are not submitted for overlapping surfaces,
+  // causing /2 to fail outside of Viz. https::/crbug.com/846798
+  if (base::FeatureList::IsEnabled(features::kEnableVizHitTestSurfaceLayer) &&
+      !base::FeatureList::IsEnabled(features::kVizDisplayCompositor)) {
+    return;
+  }
+
   // Have two iframes to avoid going to short circuit path during the second
   // targeting.
   GURL main_url(
@@ -1660,8 +1664,8 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
       static_cast<RenderWidgetHostViewBase*>(
           child_node2->current_frame_host()->GetRenderWidgetHost()->GetView());
 
-  WaitForChildFrameSurfaceReady(child_node1->current_frame_host());
-  WaitForChildFrameSurfaceReady(child_node2->current_frame_host());
+  WaitForHitTestDataOrChildSurfaceReady(child_node1->current_frame_host());
+  WaitForHitTestDataOrChildSurfaceReady(child_node2->current_frame_host());
 
   const gfx::PointF child_location(50, 50);
   gfx::PointF parent_location =

testing/buildbot/filters/viz.content_browsertests.filter

@@ -11,9 +11,6 @@
 -SitePerProcessHitTestBrowserTest.CrossProcessMouseCapture*
 -SitePerProcessHitTestBrowserTest.TouchpadPinchOverOOPIF*
 
-# /2 Variant does not handle overlapping surfaces: https://crbug.com/846798
--SitePerProcessHitTestBrowserTest.HitTestStaleDataDeletedView*
-
 ### Mac
 # BrowserSideFlingBrowserTest timing out https://crbug.com/842325
 -BrowserSideFlingBrowserTest.AutoscrollFling