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

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

Issue 23452025: Move EME key system knowledge from content/ to chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test on Android Created 7 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
« no previous file with comments | « chrome/renderer/media/chrome_key_systems.cc ('k') | content/renderer/media/crypto/key_systems.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7a5a24d478a17fd22ad3d26f18838a531abfb615..472d658b84b2e16f45f1bd6ba2d03f8447609253 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -184,6 +184,7 @@ class WVEncryptedMediaTest : public EncryptedMediaTest {
};
#endif // defined(WIDEVINE_CDM_AVAILABLE)
+#if 0 // TODO(shadi): Figure out what to do with these tests.
INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
::testing::Combine(
::testing::Values(kClearKeyKeySystem), ::testing::Values(SRC, MSE)));
@@ -203,6 +204,7 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, ConfigChangeVideo_ExternalClearKey) {
IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, ConfigChangeVideo_ClearKey) {
TestConfigChange(kClearKeyKeySystem, kEnded);
}
+#endif // 0
IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
TestMSESimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo,
@@ -210,6 +212,7 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
"GENERATE_KEY_REQUEST_EXCEPTION");
}
+#if 0 // TODO(shadi): Figure out what to do with these tests.
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly, GetParam(), kEnded);
}
@@ -266,7 +269,9 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_MP4) {
std::tr1::get<0>(test_params), kEnded);
}
#endif // defined(USE_PROPRIETARY_CODECS)
+#endif // 0
+// TODO(shadi): Do we need both this and InvalidKeySystem?
IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm",
kWebMAudioOnly, "com.example.foo", SRC,
@@ -282,6 +287,7 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, WVParentThrowsException) {
"GENERATE_KEY_REQUEST_EXCEPTION");
}
+#if 0 // TODO(shadi): Figure out what to do with these tests.
IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_WebM) {
TestMSESimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly,
kWidevineKeySystem);
@@ -318,6 +324,7 @@ IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_MP4) {
kWidevineKeySystem);
}
#endif // defined(USE_PROPRIETARY_CODECS)
+#endif // 0
#endif // defined(WIDEVINE_CDM_AVAILABLE)
} // namespace content
« no previous file with comments | « chrome/renderer/media/chrome_key_systems.cc ('k') | content/renderer/media/crypto/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698