Disable flaky WebRtcVideoDisplayPerfBrowserTests on windows.

When trying to disable tests via the instantiation name tests were still running when they should have been disabled.

TBR=hbos@chromium.org

Bug: 993020
Change-Id: Ic1df1c65158acc39714bc2393668d2b21240c7bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894313Reviewed-by: Caroline Rising <corising@chromium.org>
Commit-Queue: Caroline Rising <corising@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711497}

chrome/browser/media/webrtc/webrtc_video_display_perf_browsertest.cc

@@ -176,14 +176,23 @@ std::vector<double> ParseGoogMaxDecodeFromWebrtcInternalsTab(
 // This test traces certain categories for a period of time. It follows the
 // lifetime of a single video frame by synchronizing on the timestamps values
 // attached to trace events. Then, it calculates the duration and related stats.
-class WebRtcVideoDisplayPerfBrowserTest
+
+// TODO(https://crbug.com/993020): Fix flakes on Windows bots.
+#if defined(OS_WIN)
+#define MAYBE_WebRtcVideoDisplayPerfBrowserTest \
+  DISABLED_WebRtcVideoDisplayPerfBrowserTest
+#else
+#define MAYBE_WebRtcVideoDisplayPerfBrowserTest \
+  WebRtcVideoDisplayPerfBrowserTest
+#endif
+class MAYBE_WebRtcVideoDisplayPerfBrowserTest
     : public WebRtcTestBase,
       public testing::WithParamInterface<
           std::tuple<gfx::Size /* resolution */,
                      int /* fps */,
                      bool /* disable_render_smoothness_algorithm */>> {
  public:
-  WebRtcVideoDisplayPerfBrowserTest() {
+  MAYBE_WebRtcVideoDisplayPerfBrowserTest() {
     const auto& params = GetParam();
     const gfx::Size& resolution = std::get<0>(params);
     test_config_ = {resolution.width(), resolution.height(),
@@ -450,29 +459,21 @@ class WebRtcVideoDisplayPerfBrowserTest
   std::vector<double> webrtc_decode_latencies_;
 };
 
-// TODO(https://crbug.com/993020): Fix flakes on Windows bots.
-#if defined(OS_WIN)
-#define MAYBE_WebRtcVideoDisplayPerfBrowserTests \
-  DISABLED_WebRtcVideoDisplayPerfBrowserTests
-#else
-#define MAYBE_WebRtcVideoDisplayPerfBrowserTests \
-  WebRtcVideoDisplayPerfBrowserTests
-#endif
-INSTANTIATE_TEST_SUITE_P(MAYBE_WebRtcVideoDisplayPerfBrowserTests,
-                         WebRtcVideoDisplayPerfBrowserTest,
+INSTANTIATE_TEST_SUITE_P(WebRtcVideoDisplayPerfBrowserTests,
+                         MAYBE_WebRtcVideoDisplayPerfBrowserTest,
                          testing::Combine(testing::Values(gfx::Size(1280, 720),
                                                           gfx::Size(1920,
                                                                     1080)),
                                           testing::Values(30, 60),
                                           testing::Bool()));
 
-IN_PROC_BROWSER_TEST_P(WebRtcVideoDisplayPerfBrowserTest,
+IN_PROC_BROWSER_TEST_P(MAYBE_WebRtcVideoDisplayPerfBrowserTest,
                        MANUAL_TestVideoDisplayPerfVP9) {
   TestVideoDisplayPerf("VP9");
 }
 
 #if BUILDFLAG(RTC_USE_H264)
-IN_PROC_BROWSER_TEST_P(WebRtcVideoDisplayPerfBrowserTest,
+IN_PROC_BROWSER_TEST_P(MAYBE_WebRtcVideoDisplayPerfBrowserTest,
                        MANUAL_TestVideoDisplayPerfH264) {
   if (!base::FeatureList::IsEnabled(
           blink::features::kWebRtcH264WithOpenH264FFmpeg)) {