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

Unified Diff: media/base/key_systems_unittest.cc

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix layout tests. Created 4 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/key_systems_unittest.cc
diff --git a/media/base/key_systems_unittest.cc b/media/base/key_systems_unittest.cc
index 12543946b0f177819aeb859abd34c6d963beca6d..f99f51bbff29f792371a861fecf2f190931dea20 100644
--- a/media/base/key_systems_unittest.cc
+++ b/media/base/key_systems_unittest.cc
@@ -32,7 +32,6 @@ const char kExternalParent[] = "x-com.example";
const char kExternalNameForUMA[] = "External";
const char kClearKey[] = "org.w3.clearkey";
-const char kPrefixedClearKey[] = "webkit-org.w3.clearkey";
const char kExternalClearKey[] = "org.chromium.externalclearkey";
const char kAudioWebM[] = "audio/webm";
@@ -143,9 +142,9 @@ TestMediaClient::~TestMediaClient() {
void TestMediaClient::AddKeySystemsInfoForUMA(
std::vector<KeySystemInfoForUMA>* key_systems_info_for_uma) {
key_systems_info_for_uma->push_back(
- media::KeySystemInfoForUMA(kUsesAes, kUseAesNameForUMA, false));
+ media::KeySystemInfoForUMA(kUsesAes, kUseAesNameForUMA));
key_systems_info_for_uma->push_back(
- media::KeySystemInfoForUMA(kExternal, kExternalNameForUMA, true));
+ media::KeySystemInfoForUMA(kExternal, kExternalNameForUMA));
}
bool TestMediaClient::IsKeySystemsUpdateNeeded() {
@@ -367,10 +366,6 @@ TEST_F(KeySystemsTest, ClearKey) {
kVideoWebM, no_codecs(), kClearKey));
EXPECT_EQ("ClearKey", GetKeySystemNameForUMA(kClearKey));
-
- // Prefixed Clear Key is not supported internally.
- EXPECT_FALSE(IsSupportedKeySystem(kPrefixedClearKey));
- EXPECT_EQ("Unknown", GetKeySystemNameForUMA(kPrefixedClearKey));
}
TEST_F(KeySystemsTest, ClearKeyWithInitDataType) {
@@ -587,8 +582,6 @@ TEST_F(KeySystemsTest, Basic_ExternalDecryptor) {
TEST_F(KeySystemsTest, Parent_ParentRegistered) {
// Unprefixed has no parent key system support.
xhwang 2016/02/19 23:39:14 Now we only have one EME, we probably should stop
ddorwin 2016/02/20 01:04:46 We can fix that as we find it. For this one, the c
EXPECT_FALSE(IsSupportedKeySystem(kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, no_codecs(), kExternalParent));
// The parent is not supported for most things.
EXPECT_EQ("Unknown", GetKeySystemNameForUMA(kExternalParent));
@@ -625,25 +618,6 @@ TEST_F(
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
kVideoWebM, vorbis_codec(), kExternal));
- // Valid video types - parent key system.
- // Prefixed has parent key system support.
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, no_codecs(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, vp8_codec(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, vp80_codec(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, vp8_and_vorbis_codecs(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, vp9_codec(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, vp90_codec(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, vp9_and_vorbis_codecs(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, vorbis_codec(), kExternalParent));
-
// Non-Webm codecs.
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
kVideoWebM, foovideo_codec(), kExternal));
@@ -658,13 +632,6 @@ TEST_F(
EXPECT_TRUE(IsSupportedKeySystemWithAudioMimeType(
kAudioWebM, vorbis_codec(), kExternal));
- // Valid audio types - parent key system.
- // Prefixed has parent key system support.
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kAudioWebM, no_codecs(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kAudioWebM, vorbis_codec(), kExternalParent));
-
// Non-audio codecs.
EXPECT_FALSE(IsSupportedKeySystemWithAudioMimeType(
kAudioWebM, vp8_codec(), kExternal));
@@ -695,17 +662,6 @@ TEST_F(
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
kVideoFoo, fooaudio_codec(), kExternal));
- // Valid video types - parent key system.
- // Prefixed has parent key system support.
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoFoo, no_codecs(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoFoo, foovideo_codec(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoFoo, foovideo_and_fooaudio_codecs(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoFoo, fooaudio_codec(), kExternalParent));
-
// Extended codecs fail because this is handled by SimpleWebMimeRegistryImpl.
// They should really pass canPlayType().
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
@@ -729,13 +685,6 @@ TEST_F(
EXPECT_TRUE(IsSupportedKeySystemWithAudioMimeType(
kAudioFoo, fooaudio_codec(), kExternal));
- // Valid audio types - parent key system.
- // Prefixed has parent key system support.
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kAudioFoo, no_codecs(), kExternalParent));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kAudioFoo, fooaudio_codec(), kExternalParent));
-
// Non-audio codecs.
EXPECT_FALSE(IsSupportedKeySystemWithAudioMimeType(
kAudioFoo, foovideo_codec(), kExternal));
@@ -749,8 +698,6 @@ TEST_F(
TEST_F(KeySystemsTest, KeySystemNameForUMA) {
EXPECT_EQ("ClearKey", GetKeySystemNameForUMA(kClearKey));
- // Prefixed is not supported internally.
- EXPECT_EQ("Unknown", GetKeySystemNameForUMA(kPrefixedClearKey));
// External Clear Key never has a UMA name.
EXPECT_EQ("Unknown", GetKeySystemNameForUMA(kExternalClearKey));
@@ -772,24 +719,6 @@ TEST_F(KeySystemsTest, KeySystemsUpdate) {
EXPECT_FALSE(IsSupportedKeySystem(kExternal));
}
-TEST_F(KeySystemsTest, PrefixedKeySystemsUpdate) {
- EXPECT_TRUE(IsSupportedKeySystem(kUsesAes));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, no_codecs(), kUsesAes));
- EXPECT_TRUE(IsSupportedKeySystem(kExternal));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, no_codecs(), kExternal));
-
- UpdateClientKeySystems();
-
- EXPECT_TRUE(IsSupportedKeySystem(kUsesAes));
- EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, no_codecs(), kUsesAes));
- EXPECT_FALSE(IsSupportedKeySystem(kExternal));
- EXPECT_FALSE(PrefixedIsSupportedKeySystemWithMediaMimeType(
- kVideoWebM, no_codecs(), kExternal));
-}
-
TEST_F(KeySystemsPotentiallySupportedNamesTest, PotentiallySupportedNames) {
EXPECT_FALSE(IsSupportedKeySystem("org.w3"));
EXPECT_FALSE(IsSupportedKeySystem("org.w3."));

Powered by Google App Engine
This is Rietveld 408576698