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..f8d24a9864ee2331e3355c98c6831f8d0b5a205a 100644 |
--- a/content/browser/media/media_source_browsertest.cc |
+++ b/content/browser/media/media_source_browsertest.cc |
@@ -5,6 +5,7 @@ |
#include "base/command_line.h" |
#include "content/browser/media/media_browsertest.h" |
#include "content/public/common/content_switches.h" |
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
// Common media types. |
static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; |
@@ -17,6 +18,13 @@ class MediaSourceTest : public content::MediaBrowserTest { |
public: |
void TestSimplePlayback(const char* media_file, const char* media_type, |
const char* expectation) { |
+ // TODO(xhwang): Update this to check for unprefixed MSE API when |
+ // http://crbug.com/307107 is fixed. |
+ if (!WebKit::WebRuntimeFeatures::isWebKitMediaSourceEnabled()) { |
+ LOG(INFO) << "Could not run test - prefixed 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 +59,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) { |
+ // TODO(xhwang): Update this to check for unprefixed MSE API when |
+ // http://crbug.com/307107 is fixed. |
+ if (!WebKit::WebRuntimeFeatures::isWebKitMediaSourceEnabled()) { |
+ LOG(INFO) << "Could not run test - prefixed MSE not supported."; |
+ return; |
+ } |
RunMediaTestPage("mse_config_change.html", NULL, kEnded, true); |
} |