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

Unified Diff: media/base/android/media_drm_bridge_unittest.cc

Issue 930413003: MediaDrm: Only apply Widevine security levels to the Widevine key system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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: media/base/android/media_drm_bridge_unittest.cc
diff --git a/media/base/android/media_drm_bridge_unittest.cc b/media/base/android/media_drm_bridge_unittest.cc
index 1a4c01426ae76af8ffccf8b644717a4913422656..a0ca6f5c2e156b2731bc6c87008bf7893b659151 100644
--- a/media/base/android/media_drm_bridge_unittest.cc
+++ b/media/base/android/media_drm_bridge_unittest.cc
@@ -45,27 +45,6 @@ static bool IsKeySystemSupportedWithType(
container_mime_type);
}
-static bool IsSecurityLevelSupported(
- const std::string& key_system,
- MediaDrmBridge::SecurityLevel security_level) {
- return MediaDrmBridge::IsSecurityLevelSupported(key_system, security_level);
ddorwin 2015/02/18 02:19:26 This is the only place this function is used. Does
qinmin 2015/02/18 06:45:40 i am ok to remove these tests. The function is use
ddorwin 2015/02/18 18:11:50 They were also covering setting security levels fo
-}
-
-TEST(MediaDrmBridgeTest, IsSecurityLevelSupported_Widevine) {
- EXPECT_FALSE(IsSecurityLevelSupported(kWidevineKeySystem, kLNone));
- // We test "L3" fully. But for "L1" we don't check the result as it depends on
- // whether the test device supports "L1".
- EXPECT_TRUE_IF_AVAILABLE(IsSecurityLevelSupported(kWidevineKeySystem, kL3));
- IsSecurityLevelSupported(kWidevineKeySystem, kL1);
-}
-
-// Invalid keysytem is NOT supported regardless whether MediaDrm is available.
-TEST(MediaDrmBridgeTest, IsSecurityLevelSupported_InvalidKeySystem) {
- EXPECT_FALSE(IsSecurityLevelSupported(kInvalidKeySystem, kLNone));
- EXPECT_FALSE(IsSecurityLevelSupported(kInvalidKeySystem, kL1));
- EXPECT_FALSE(IsSecurityLevelSupported(kInvalidKeySystem, kL3));
-}
-
TEST(MediaDrmBridgeTest, IsKeySystemSupported_Widevine) {
EXPECT_TRUE_IF_AVAILABLE(IsKeySystemSupported(kWidevineKeySystem));
« media/base/android/media_drm_bridge.cc ('K') | « media/base/android/media_drm_bridge.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698