Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Unified Diff: content/browser/webrtc/webrtc_capture_from_element_browsertest.cc

Issue 2362553002: Disable WebRtcCaptureFromElementBrowserTest.MAYBE_CaptureFromMediaElement in devices pre-Marshmallow (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webrtc/webrtc_capture_from_element_browsertest.cc
diff --git a/content/browser/webrtc/webrtc_capture_from_element_browsertest.cc b/content/browser/webrtc/webrtc_capture_from_element_browsertest.cc
index 1aa62cd1b3bc35d4ef85a0d0855cddf3c4aa7ae4..4559cf2e24ef89ec097eae0a32da43815b034fbb 100644
--- a/content/browser/webrtc/webrtc_capture_from_element_browsertest.cc
+++ b/content/browser/webrtc/webrtc_capture_from_element_browsertest.cc
@@ -8,6 +8,11 @@
#include "content/public/common/content_switches.h"
#include "media/base/test_data_util.h"
+#if defined(OS_ANDROID)
+#include "base/android/build_info.h"
+#include "base/sys_info.h"
+#endif
+
#if defined(ENABLE_MOJO_RENDERER)
// Remote mojo renderer does not send audio/video frames back to the renderer
// process and hence does not support capture: https://crbug.com/641559.
@@ -70,6 +75,16 @@ IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest,
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(
base::StringPrintf("testCaptureFromMediaElement(\"%s\", %d, %d, %d);",
GetParam().filename.c_str(),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698