Re-enable ConfigChangeVideo and EncryptedMediaTests

This CL re-enables flaky tests, the underlying issue should have been
fixed by https://crrev.com/c/2280467

Bug: 246308, 1099384
Change-Id: I76aed73aea7143b73c93aaefb2d7d1060ada4bc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2283396
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791983}

content/browser/media/encrypted_media_browsertest.cc

@@ -337,15 +337,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4_AV1_10bit) {
 
 // Strictly speaking this is not an "encrypted" media test. Keep it here for
 // completeness.
-#if defined(OS_ANDROID)
-// Flaky on Android: https://crbug.com/1099384
-#define MAYBE_ConfigChangeVideo_ClearToClear \
-  DISABLED_ConfigChangeVideo_ClearToClear
-#else
-#define MAYBE_ConfigChangeVideo_ClearToClear ConfigChangeVideo_ClearToClear
-#endif
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       MAYBE_ConfigChangeVideo_ClearToClear) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_ClearToClear) {
   TestConfigChange(ConfigChangeType::CLEAR_TO_CLEAR);
 }
 
@@ -362,29 +354,12 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
   TestConfigChange(ConfigChangeType::CLEAR_TO_ENCRYPTED);
 }
 
-#if defined(OS_ANDROID)
-// Flaky on Android: https://crbug.com/1099384
-#define MAYBE_ConfigChangeVideo_EncryptedToClear \
-  DISABLED_ConfigChangeVideo_EncryptedToClear
-#else
-#define MAYBE_ConfigChangeVideo_EncryptedToClear \
-  ConfigChangeVideo_EncryptedToClear
-#endif
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       MAYBE_ConfigChangeVideo_EncryptedToClear) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_EncryptedToClear) {
   TestConfigChange(ConfigChangeType::ENCRYPTED_TO_CLEAR);
 }
 
-#if defined(OS_ANDROID)
-// Flaky on Android: https://crbug.com/1099384
-#define MAYBE_ConfigChangeVideo_EncryptedToEncrypted \
-  DISABLED_ConfigChangeVideo_EncryptedToEncrypted
-#else
-#define MAYBE_ConfigChangeVideo_EncryptedToEncrypted \
-  ConfigChangeVideo_EncryptedToEncrypted
-#endif
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       MAYBE_ConfigChangeVideo_EncryptedToEncrypted) {
+                       ConfigChangeVideo_EncryptedToEncrypted) {
   TestConfigChange(ConfigChangeType::ENCRYPTED_TO_ENCRYPTED);
 }
 

content/browser/media/media_source_browsertest.cc

@@ -82,14 +82,8 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) {
 }
 
 // Flaky test crbug.com/246308
-#if defined(OS_ANDROID)
-// Disabled on Android where it fails more frequently.
-#define MAYBE_ConfigChangeVideo DISABLED_ConfigChangeVideo
-#else
-#define MAYBE_ConfigChangeVideo ConfigChangeVideo
-#endif
 // Test changed to skip checks resulting in flakiness. Proper fix still needed.
-IN_PROC_BROWSER_TEST_F(MediaSourceTest, MAYBE_ConfigChangeVideo) {
+IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
   RunMediaTestPage("mse_config_change.html", base::StringPairs(), media::kEnded,
                    true);
 }