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 bd119ddff07710c6c1ff2a2fc75d7933b56c3260..645291265ec0647d377cacbfe1da879673081738 100644 |
--- a/content/browser/media/media_source_browsertest.cc |
+++ b/content/browser/media/media_source_browsertest.cc |
@@ -5,6 +5,9 @@ |
#include "base/command_line.h" |
#include "content/browser/media/media_browsertest.h" |
#include "content/public/common/content_switches.h" |
+#if defined(OS_ANDROID) |
+#include "base/android/build_info.h" |
+#endif |
// Common media types. |
static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; |
@@ -17,6 +20,13 @@ class MediaSourceTest : public content::MediaBrowserTest { |
public: |
void TestSimplePlayback(const char* media_file, const char* media_type, |
const char* expectation) { |
+#if defined(OS_ANDROID) |
+ if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) { |
+ LOG(INFO) << "Skipping test - MSE only supported in JellyBean and later."; |
+ return; |
+ } |
+#endif // defined(OS_ANDROID) |
+ |
std::vector<StringPair> query_params; |
query_params.push_back(std::make_pair("mediafile", media_file)); |
query_params.push_back(std::make_pair("mediatype", media_type)); |
@@ -51,6 +61,12 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { |
// Flaky test crbug.com/246308 |
// Test changed to skip checks resulting in flakiness. Proper fix still needed. |
IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { |
+#if defined(OS_ANDROID) |
+ if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) { |
+ LOG(INFO) << "Skipping test - MSE only supported in JellyBean and later."; |
+ return; |
+ } |
+#endif // defined(OS_ANDROID) |
RunMediaTestPage("mse_config_change.html", NULL, kEnded, true); |
} |