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

Unified Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html

Issue 2707393002: Revert "EME: Fail requestMediaKeySystemAccess if no capabilities specified"
Patch Set: Created 3 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: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
index 1854efb60e4093504b8c1da47f05ae42b80fa669..f30357de95c7103324992d00fa53d2296960a649 100644
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
@@ -78,7 +78,7 @@
// Tests for trivial configurations.
expect_error('org.w3.clearkey', [], 'TypeError', 'Empty supportedConfigurations');
- expect_error('org.w3.clearkey', [{}], 'NotSupportedError', 'Empty configuration');
+ expect_config('org.w3.clearkey', [{}], {}, 'Empty configuration');
// contentType without codecs is not supported.
expect_error('org.w3.clearkey', [{
@@ -181,20 +181,13 @@
}], 'NotSupportedError', 'Mismatched video container/codec');
expect_config('org.w3.clearkey', [
- { initDataTypes: ['fakeidt'],
- audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
- },
- { initDataTypes: ['webm'],
- audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
- }
+ {initDataTypes: ['fakeidt']},
+ {initDataTypes: ['webm']}
], {initDataTypes: ['webm']}, 'Two configurations, one supported');
expect_config('org.w3.clearkey', [
- { initDataTypes: ['webm'],
- audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
- },
- { audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
- }
+ {initDataTypes: ['webm']},
+ {}
], {initDataTypes: ['webm']}, 'Two configurations, both supported');
// Audio MIME type does not support video codecs.
@@ -355,23 +348,19 @@
// Verify 'temporary' sessionType.
expect_config('org.w3.clearkey', [{
- sessionTypes: [ 'temporary' ],
- audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+ sessionTypes: [ 'temporary' ]
}], {
- sessionTypes: [ 'temporary' ],
- audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+ sessionTypes: [ 'temporary' ]
}, 'temporary sessionType');
// Clear Key doesn't support persistent sessions.
expect_error('org.w3.clearkey', [{
- sessionTypes: [ 'persistent-license' ],
- audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+ sessionTypes: [ 'persistent-license' ]
}], 'NotSupportedError', 'persistent-license sessionType');
// Verify invalid sessionTypes.
expect_error('org.w3.clearkey', [{
- sessionTypes: [ 'foo' ],
- audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+ sessionTypes: [ 'foo' ]
}], 'NotSupportedError', 'invalid sessionType');
</script>
</body>

Powered by Google App Engine
This is Rietveld 408576698