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

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

Issue 27230004: Do not run MSE related tests when MSE is not available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Check MediaCodecBridge Availability Created 7 years, 2 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
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..14d043033a2ec8aa0ca1c6db6c651eb4ac10e536 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 "media/base/android/media_codec_bridge.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 (!media::MediaCodecBridge::IsAvailable()) {
+ LOG(INFO) << "Could not run test - MSE not supported.";
+ 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 (!media::MediaCodecBridge::IsAvailable()) {
+ LOG(INFO) << "Could not run test - MSE not supported.";
+ return;
+ }
+#endif // defined(OS_ANDROID)
RunMediaTestPage("mse_config_change.html", NULL, kEnded, true);
}

Powered by Google App Engine
This is Rietveld 408576698