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..360baa76fdfaf671cf70f37ddd17399cb8ce21dd 100644 |
--- a/content/browser/media/media_source_browsertest.cc |
+++ b/content/browser/media/media_source_browsertest.cc |
@@ -5,18 +5,37 @@ |
#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\""; |
-static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\""; |
-static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\""; |
+const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; |
+const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\""; |
+const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\""; |
namespace content { |
+// MSE is available on all desktop platforms and on Android 4.1 and later. |
+static bool IsMSESupported() { |
+#if defined(OS_ANDROID) |
+ if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) { |
+ LOG(INFO) << "MSE is only supported in Android 4.1 and later."; |
+ return false; |
+ } |
+#endif // defined(OS_ANDROID) |
+ return true; |
+} |
+ |
class MediaSourceTest : public content::MediaBrowserTest { |
public: |
void TestSimplePlayback(const char* media_file, const char* media_type, |
const char* expectation) { |
+ if (!IsMSESupported()) { |
+ LOG(INFO) << "Skipping test - MSE not supported."; |
+ return; |
+ } |
+ |
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 +70,10 @@ 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 (!IsMSESupported()) { |
+ LOG(INFO) << "Skipping test - MSE not supported."; |
+ return; |
+ } |
RunMediaTestPage("mse_config_change.html", NULL, kEnded, true); |
} |