| 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 c68daf7578fa3c5b73fd38636f31c18bc236e769..8f30094a88aaec7da5a463ed7b358d24a2a7d55e 100644
|
| --- a/content/browser/media/encrypted_media_browsertest.cc
|
| +++ b/content/browser/media/encrypted_media_browsertest.cc
|
| @@ -104,9 +104,17 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
|
| #endif
|
| };
|
|
|
| -INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
|
| - ::testing::Combine(
|
| - ::testing::Values(kClearKeyKeySystem), ::testing::Values(SRC, MSE)));
|
| +using ::testing::Combine;
|
| +using ::testing::Values;
|
| +
|
| +#if !defined(OS_ANDROID)
|
| +// Encrypted media playback with SRC is not supported on Android.
|
| +INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest,
|
| + Combine(Values(kClearKeyKeySystem), Values(SRC)));
|
| +#endif // defined(OS_ANDROID)
|
| +
|
| +INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest,
|
| + Combine(Values(kClearKeyKeySystem), Values(MSE)));
|
|
|
| IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
|
| TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly);
|
| @@ -143,7 +151,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
|
|
|
| IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
|
| RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm",
|
| - kWebMAudioOnly, "com.example.foo", SRC,
|
| + kWebMAudioOnly, "com.example.foo", MSE,
|
| kEmeGkrException);
|
| }
|
|
|
|
|