Reland "sheriff: Disable BrowserNonClientFrameViewPopupTest.HitTestPopupTopChrome."

This reverts commit 1eeaf38b.

Reason for revert: Test is still flaky

Original change's description:
> Revert "sheriff: Disable BrowserNonClientFrameViewPopupTest.HitTestPopupTopChrome."
> 
> This reverts commit e9e520a3.
> 
> Reason for revert: Flakiness unlikely to be caused by the test itself.
> 
> Original change's description:
> > sheriff: Disable BrowserNonClientFrameViewPopupTest.HitTestPopupTopChrome.
> > 
> > Flaky on Linux ASAN and TSAN.
> > 
> > TBR=bsep
> > 
> > Bug: 998946
> > Change-Id: Iead970e3ca6738c495a9b922c19f24294b9093e4
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1774006
> > Reviewed-by: Darren Shen <shend@chromium.org>
> > Commit-Queue: Darren Shen <shend@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#691478}
> 
> TBR=shend@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: 998946
> Change-Id: Id164a193c1182b71d002b66b4e8b328fddde7402
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1835619
> Reviewed-by: Bret Sepulveda <bsep@chromium.org>
> Commit-Queue: Bret Sepulveda <bsep@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#702017}

TBR=bsep@chromium.org,shend@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 998946
Change-Id: Ib22b71a4d4fc6ddf74c0be5cd16eb8bd5896599a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1840096Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702794}

chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc

@@ -51,7 +51,14 @@ class BrowserNonClientFrameViewPopupTest
       : BrowserNonClientFrameViewTest(Browser::TYPE_POPUP) {}
 };
 
-TEST_F(BrowserNonClientFrameViewPopupTest, HitTestPopupTopChrome) {
+// TODO(crbug.com/998369): Flaky on Linux TSAN and ASAN.
+#if defined(OS_LINUX) && \
+    (defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER))
+#define MAYBE_HitTestPopupTopChrome DISABLED_HitTestPopupTopChrome
+#else
+#define MAYBE_HitTestPopupTopChrome HitTestPopupTopChrome
+#endif
+TEST_F(BrowserNonClientFrameViewPopupTest, MAYBE_HitTestPopupTopChrome) {
   EXPECT_FALSE(frame_view_->HitTestRect(gfx::Rect(-1, 4, 1, 1)));
   EXPECT_FALSE(frame_view_->HitTestRect(gfx::Rect(4, -1, 1, 1)));
   const int top_inset = frame_view_->GetTopInset(false);