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

Unified Diff: content/browser/media/media_source_browsertest.cc

Issue 1931023004: Disable flaky MediaSourceTest.Playback_Video_MP4_Audio_WEBM on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/media/media_source_browsertest.cc
diff --git a/content/browser/media/media_source_browsertest.cc b/content/browser/media/media_source_browsertest.cc
index 90d11ba59332ceef90b8e98f71ea3be6f3d11dec..f6f86b2a4141951058a784c8508932ea97683693 100644
--- a/content/browser/media/media_source_browsertest.cc
+++ b/content/browser/media/media_source_browsertest.cc
@@ -107,6 +107,9 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
}
#if defined(USE_PROPRIETARY_CODECS)
+
+// TODO(chcunningham): Figure out why this is flaky on android. crbug/607841
+#if !defined(OS_ANDROID)
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_MP4_Audio_WEBM) {
if (!IsMSESupported()) {
VLOG(0) << "Skipping test - MSE not supported.";
@@ -117,6 +120,7 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_MP4_Audio_WEBM) {
query_params.push_back(std::make_pair("audioFormat", "CLEAR_WEBM"));
RunMediaTestPage("mse_different_containers.html", query_params, kEnded, true);
}
+#endif // !defined(OS_ANDROID)
IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_WEBM_Audio_MP4) {
if (!IsMSESupported()) {
« 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