Disable audio process for linux media browsertests.

There's some sort of process spawn failure on the bots that we haven't
been able to debug yet. Instead of slowly disabling every test for
flakiness, just disable the audio process on linux for these tests.

This also enables a couple tests which were either never really
disabled (MAC_OSX vs OS_MACOS) or are fixed by the ScopedFeatureList.

BUG=832800,847881,979259,986021,1001364
R=xhwang

Change-Id: Ie9519e9a5671e9143521e9da893e208d58a520a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1835687
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702540}

chrome/browser/media/encrypted_media_browsertest.cc

@@ -553,9 +553,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) {
   TestSimplePlayback("bear-320x240-opus-av_enc-v.webm");
 }
 
-// TODO(xhwang): Test is flaky. https://crbug.com/890124.
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       DISABLED_Playback_Multiple_VideoAudio_WebM) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_Multiple_VideoAudio_WebM) {
   if (!IsPlayBackPossible(CurrentKeySystem())) {
     DVLOG(0) << "Skipping test - Playback_Multiple test requires playback.";
     return;
@@ -721,13 +719,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4) {
   TestSimplePlayback("bear-640x360-v_frag-cenc.mp4");
 }
 
-// Flaky: crbug.com/847881
-#if defined(MAC_OSX)
-#define MAYBE_Playback_VideoOnly_MP4_MDAT DISABLED_Playback_VideoOnly_MP4_MDAT
-#else
-#define MAYBE_Playback_VideoOnly_MP4_MDAT Playback_VideoOnly_MP4_MDAT
-#endif
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_Playback_VideoOnly_MP4_MDAT) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4_MDAT) {
   // MP4 without MSE is not support yet, http://crbug.com/170793.
   if (CurrentSourceType() != SrcType::MSE) {
     DVLOG(0) << "Skipping test; Can only play MP4 encrypted streams by MSE.";
@@ -795,8 +787,7 @@ IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, InitializeCDMFail) {
 
 // When CDM crashes, we should still get a decode error and all sessions should
 // be closed.
-// Flaky: crbug.com/832800
-IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, DISABLED_CDMCrashDuringDecode) {
+IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, CDMCrashDuringDecode) {
   TestNonPlaybackCases(kExternalClearKeyCrashKeySystem,
                        kEmeSessionClosedAndError);
 }

chrome/browser/media/media_browsertest.cc

@@ -8,12 +8,14 @@
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_features.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/audio/audio_features.h"
 #include "media/base/media_switches.h"
@@ -29,12 +31,20 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
       switches::kAutoplayPolicy,
       switches::autoplay::kNoUserGestureRequiredPolicy);
 
-  scoped_feature_list_.InitWithFeatures(
-      // Enable audio thread hang dumps to help triage bot failures.
-      /*enabled_features=*/{features::kDumpOnAudioServiceHang},
-      // Disable fallback after decode error to avoid unexpected test pass on
-      // the fallback path.
-      /*disabled_features=*/{media::kFallbackAfterDecodeError});
+  std::vector<base::Feature> disabled_features = {
+    // Disable fallback after decode error to avoid unexpected test pass on
+    // the fallback path.
+    media::kFallbackAfterDecodeError,
+
+#if defined(OS_LINUX)
+    // Disable out of process audio on Linux due to process spawn
+    // failures. http://crbug.com/986021
+    features::kAudioServiceOutOfProcess,
+#endif
+  };
+
+  scoped_feature_list_.InitWithFeatures({/* enabled_features */},
+                                        disabled_features);
 }
 
 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,

content/browser/media/encrypted_media_browsertest.cc

@@ -264,16 +264,13 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4_VP9) {
 }
 
 // TODO(crbug.com/707127): Decide when it's supported on Android.
-// FLAKY: crbug.com/1001399
 #if !defined(OS_ANDROID)
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       DISABLED_Playback_VideoOnly_WebM_VP9Profile2) {
+                       Playback_VideoOnly_WebM_VP9Profile2) {
   TestSimplePlayback("bear-320x240-v-vp9_profile2_subsample_cenc-v.webm");
 }
 
-// Flaky, disabled. https://crbug.com/1001364.
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       DISABLED_Playback_VideoOnly_MP4_VP9Profile2) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4_VP9Profile2) {
   // MP4 without MSE is not support yet, http://crbug.com/170793.
   if (CurrentSourceType() != SrcType::MSE) {
     DVLOG(0) << "Skipping test; Can only play MP4 encrypted streams by MSE.";
@@ -288,9 +285,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM_AV1) {
   TestSimplePlayback("bear-av1-cenc.webm");
 }
 
-// Flaky, disabled. https://crbug.com/1001364.
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       DISABLED_Playback_VideoOnly_WebM_AV1_10bit) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM_AV1_10bit) {
   TestSimplePlayback("bear-av1-320x180-10bit-cenc.webm");
 }
 

content/browser/media/media_browsertest.cc

@@ -9,6 +9,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
@@ -34,12 +35,20 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
       switches::autoplay::kNoUserGestureRequiredPolicy);
   command_line->AppendSwitch(switches::kExposeInternalsForTesting);
 
-  scoped_feature_list_.InitWithFeatures(
-      // Enable audio thread hang dumps to help triage bot failures.
-      /*enabled_features=*/{features::kDumpOnAudioServiceHang},
-      // Disable fallback after decode error to avoid unexpected test pass on
-      // the fallback path.
-      /*disabled_features=*/{media::kFallbackAfterDecodeError});
+  std::vector<base::Feature> disabled_features = {
+    // Disable fallback after decode error to avoid unexpected test pass on
+    // the fallback path.
+    media::kFallbackAfterDecodeError,
+
+#if defined(OS_LINUX)
+    // Disable out of process audio on Linux due to process spawn
+    // failures. http://crbug.com/986021
+    features::kAudioServiceOutOfProcess,
+#endif
+  };
+
+  scoped_feature_list_.InitWithFeatures({/* enabled_features */},
+                                        disabled_features);
 }
 
 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,
@@ -162,13 +171,11 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentTheora) {
 }
 #endif  // !defined(OS_ANDROID)
 
-// crbug.com/1001364: disabled due to flakiness.
-IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearWebm) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWebm) {
   PlayVideo("bear.webm", GetParam());
 }
 
-// crbug.com/1001364: disabled due to flakiness.
-IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_AudioBearOpusWebm) {
+IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearOpusWebm) {
   PlayVideo("bear-opus.webm", GetParam());
 }
 
@@ -190,8 +197,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthVP9) {
   PlayVideo("bear-320x180-hi10p-vp9.webm", GetParam());
 }
 
-// Flaky, disabled. https://crbug.com/1001364.
-IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBear12DepthVP9) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear12DepthVP9) {
   PlayVideo("bear-320x180-hi12p-vp9.webm", GetParam());
 }
 #endif
@@ -212,8 +218,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS16be) {
   PlayVideo("bear_pcm_s16be.mov", GetParam());
 }
 
-// crbug.com/1001364: disabled due to flakiness.
-IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearMovPcmS24be) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS24be) {
   PlayVideo("bear_pcm_s24be.mov", GetParam());
 }
 
@@ -244,8 +249,7 @@ IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated270) {
 
 #if !defined(OS_ANDROID)
 // Android devices usually only support baseline, main and high.
-// Flaky, disabled. https://crbug.com/1001364.
-IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearHighBitDepthMp4) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthMp4) {
   PlayVideo("bear-320x180-hi10p.mp4", GetParam());
 }
 
@@ -292,23 +296,15 @@ IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlacOgg) {
   PlayVideo("bear-flac.ogg", GetParam());
 }
 
-// Flaky on Linux. See https://crbug.com/979259
-#if defined(OS_LINUX)
-#define MAYBE_VideoBearWavAlaw DISABLED_VideoBearWavAlaw
-#else
-#define MAYBE_VideoBearWavAlaw VideoBearWavAlaw
-#endif
-IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearWavAlaw) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) {
   PlayAudio("bear_alaw.wav", GetParam());
 }
 
-// crbug.com/1001364: disabled due to flakiness.
-IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearWavMulaw) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) {
   PlayAudio("bear_mulaw.wav", GetParam());
 }
 
-// crbug.com/1001364: disabled due to flakiness.
-IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearWavPcm) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) {
   PlayAudio("bear_pcm.wav", GetParam());
 }
 
@@ -320,12 +316,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm192kHz) {
   PlayAudio("bear_192kHz.wav", GetParam());
 }
 
-#if defined(OS_LINUX) || defined(OS_MACOSX)
-#define MAYBE_VideoTulipWebm DISABLED_VideoTulipWebm
-#else
-#define MAYBE_VideoTulipWebm VideoTulipWebm
-#endif
-IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoTulipWebm) {
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) {
   PlayVideo("tulip2.webm", GetParam());
 }