Commit 495c4665 authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

Re-enable WebRtc CaptureFromMediaElement tests

These were disabled across the board due to TSAN failures. They were
also previously disabled specifically in low-end Android test
environments.

The low-end test bot that originally produced failures is no more. The
TSAN failures also appear to be gone according to local testing.

This attempts to turn the tests back on so we can see what happens.

Bug: 626299,769903
Change-Id: Id75acf5948e45b72c714af31af74507987f2078f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2119110
Auto-Submit: Ken Rockot <rockot@google.com>
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753142}
parent b3046604
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
// process and hence does not support capture: https://crbug.com/641559. // process and hence does not support capture: https://crbug.com/641559.
#define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement #define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement
#else #else
// crbug.com/769903: Disabling due to TSAN error. #define MAYBE_CaptureFromMediaElement CaptureFromMediaElement
#define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement
#endif #endif
namespace { namespace {
...@@ -125,16 +124,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, ...@@ -125,16 +124,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest, IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest,
MAYBE_CaptureFromMediaElement) { MAYBE_CaptureFromMediaElement) {
#if defined(OS_ANDROID)
// TODO(mcasas): flaky on Lollipop Low-End devices, investigate and reconnect
// https://crbug.com/626299
if (base::SysInfo::IsLowEndDevice() &&
base::android::BuildInfo::GetInstance()->sdk_int() <
base::android::SDK_VERSION_MARSHMALLOW) {
return;
}
#endif
MakeTypicalCall(JsReplace("testCaptureFromMediaElement($1, $2, $3, $4)", MakeTypicalCall(JsReplace("testCaptureFromMediaElement($1, $2, $3, $4)",
GetParam().filename, GetParam().has_video, GetParam().filename, GetParam().has_video,
GetParam().has_audio, GetParam().use_audio_tag), GetParam().has_audio, GetParam().use_audio_tag),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment