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

Unified Diff: chrome/browser/media/encrypted_media_supported_types_browsertest.cc

Issue 2847533002: Update mp4 vp9 test files to follow v1.0 spec (Closed)
Patch Set: Address build breaks on some configs Created 3 years, 7 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: chrome/browser/media/encrypted_media_supported_types_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
index 79e575b77b63b2829552386f3024260950f73f8b..7e3d9d8da8d74d72a53918298b09c5985b2ba38e 100644
--- a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
@@ -448,8 +448,8 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesClearKeyTest, Video_MP4) {
// Valid video types.
EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem(
kVideoMP4MimeType, video_mp4_codecs(), kClearKey));
- EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(
- kVideoWebMMimeType, video_common_codecs(), kClearKey));
+ EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem(
+ kVideoMP4MimeType, video_common_codecs(), kClearKey));
// High 10-bit Profile is supported when using ClearKey if
// it is supported for clear content on this platform.
@@ -598,8 +598,8 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesExternalClearKeyTest,
// Valid video types.
EXPECT_ECK_PROPRIETARY(AreCodecsSupportedByKeySystem(
kVideoMP4MimeType, video_mp4_codecs(), kExternalClearKey));
- EXPECT_ECK(AreCodecsSupportedByKeySystem(
- kVideoWebMMimeType, video_common_codecs(), kExternalClearKey));
+ EXPECT_ECK_PROPRIETARY(AreCodecsSupportedByKeySystem(
+ kVideoMP4MimeType, video_common_codecs(), kExternalClearKey));
// High 10-bit Profile is not supported when using ExternalClearKey.
EXPECT_ECK_NO_MATCH(AreCodecsSupportedByKeySystem(
@@ -717,8 +717,8 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesWidevineTest, Video_MP4) {
// Valid video types.
EXPECT_WV_PROPRIETARY(AreCodecsSupportedByKeySystem(
kVideoMP4MimeType, video_mp4_codecs(), kWidevine));
- EXPECT_WV_SUCCESS(AreCodecsSupportedByKeySystem(
- kVideoWebMMimeType, video_common_codecs(), kWidevine));
+ EXPECT_WV_PROPRIETARY(AreCodecsSupportedByKeySystem(
+ kVideoMP4MimeType, video_common_codecs(), kWidevine));
// High 10-bit Profile is not supported when using Widevine.
EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | content/browser/media/media_canplaytype_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698