EME: Fail requestMediaKeySystemAccess if no capabilities specified

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html

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 49cd47e9ae97e3e1b47bde1eb446b4033ddf71a1..8f132b2032c9dc60f5dadd8f288abecb69032597 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_config('org.w3.clearkey', [{}], {}, 'Empty configuration');
+            expect_error('org.w3.clearkey', [{}], 'NotSupportedError', 'Empty configuration');
 
             // Various combinations of supportedConfigurations.
             // TODO(jrummell): Specifying contentType without codecs is
@@ -154,13 +154,20 @@
             }], 'NotSupportedError', 'Mismatched video container/codec');
 
             expect_config('org.w3.clearkey', [
-                {initDataTypes: ['fakeidt']},
-                {initDataTypes: ['webm']}
+                { initDataTypes: ['fakeidt'],
+                  audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+                },
+                { initDataTypes: ['webm'],
+                  audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+                }
             ], {initDataTypes: ['webm']}, 'Two configurations, one supported');
 
             expect_config('org.w3.clearkey', [
-                {initDataTypes: ['webm']},
-                {}
+                { initDataTypes: ['webm'],
+                  audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+                },
+                { audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
+                }
             ], {initDataTypes: ['webm']}, 'Two configurations, both supported');
 
             // Audio MIME type does not support video codecs.
@@ -315,19 +322,23 @@
 
             // Verify 'temporary' sessionType.
             expect_config('org.w3.clearkey', [{
-                sessionTypes: [ 'temporary' ]
+                sessionTypes: [ 'temporary' ],
+                audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
             }], {
-                sessionTypes: [ 'temporary' ]
+                sessionTypes: [ 'temporary' ],
+                audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
             }, 'temporary sessionType');
 
             // Clear Key doesn't support persistent sessions.
             expect_error('org.w3.clearkey', [{
-                sessionTypes: [ 'persistent-license' ]
+                sessionTypes: [ 'persistent-license' ],
+                audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
             }], 'NotSupportedError', 'persistent-license sessionType');
 
             // Verify invalid sessionTypes.
             expect_error('org.w3.clearkey', [{
-                sessionTypes: [ 'foo' ]
+                sessionTypes: [ 'foo' ],
+                audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
             }], 'NotSupportedError', 'invalid sessionType');
         </script>
     </body>