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

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

Issue 2379303003: media: Delete code checking for pre-JellyBean Android versions (Closed)
Patch Set: Created 4 years, 3 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/encrypted_media_browsertest.cc
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index f18a2b853ce32feafa80977ba191b2a62c337676..456d5e213863a6c5307664ba944d3a25c4f1f716 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -53,17 +53,6 @@ enum SrcType {
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) {
- VLOG(0) << "MSE is only supported in Android 4.1 and later.";
- return false;
- }
-#endif // defined(OS_ANDROID)
- return true;
-}
-
// Tests encrypted media playback with a combination of parameters:
// - char*: Key system name.
// - SrcType: The type of video src used to load media, MSE or SRC.
@@ -96,11 +85,6 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
}
void TestConfigChange() {
- if (CurrentSourceType() != MSE || !IsMSESupported()) {
- VLOG(0) << "Skipping test - config change test requires MSE.";
- return;
- }
-
base::StringPairs query_params;
query_params.push_back(std::make_pair("keySystem", CurrentKeySystem()));
query_params.push_back(std::make_pair("runEncrypted", "1"));
@@ -113,11 +97,6 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
const std::string& key_system,
SrcType src_type,
const std::string& expectation) {
- if (src_type == MSE && !IsMSESupported()) {
- VLOG(0) << "Skipping test - MSE not supported.";
- return;
- }
-
base::StringPairs query_params;
query_params.push_back(std::make_pair("mediaFile", media_file));
query_params.push_back(std::make_pair("mediaType", media_type));

Powered by Google App Engine
This is Rietveld 408576698