EME: Update tests so 'audioCapabilities' always provided

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js

 var consoleDiv = null;
 
 function consoleWrite(text)
 {
     if (!consoleDiv && document.body) {
         consoleDiv = document.createElement('div');
         document.body.appendChild(consoleDiv);
     }
     var span = document.createElement('span');
     span.appendChild(document.createTextNode(text));
@@ skipping 53 matching lines @@
       var keyId = new Uint8Array([
           0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
           0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
       ]);
       return stringToUint8Array(createKeyIDs(keyId));
   }
 
   throw 'initDataType ' + initDataType + ' not supported.';
 }
 
+// Returns a MediaKeySystemConfiguration for |initDataType|. Since Chromium
+// only supports WebM by default, use an audio codec so that at least one
+// capability is specified.
+function simpleConfigurationForInitDataType(initDataType)

[ddorwin, 2016/06/23 22:52:38]

// NOTE: Supporting user agents that don't support WebM and/or Vorbis would
require passing in an audio content type. The initDataType is not actually
necessary for most tests.

[jrummell, 2016/06/24 00:12:29]

Done.

+{
+    return [ {
+        initDataTypes: [ initDataType ],
+        audioCapabilities: [ { contentType: 'audio/webm; codecs="vorbis"' } ]
+    } ];
+}
+
+// Returns a MediaKeySystemConfiguration for 'webm' that specifies
+// both audio and video capabilities.
+function webmConfiguration()

[ddorwin, 2016/06/23 22:52:38]

Just FTR, this would be avConfiguration, with types passed to it.

[jrummell, 2016/06/24 00:12:29]

Done this now.

+{
+    return [ {
+        initDataTypes: [ 'webm' ],
+        audioCapabilities: [ { contentType: 'audio/webm; codecs="vorbis"' } ],
+        videoCapabilities: [ { contentType: 'video/webm; codecs="vp8"' } ]
+    } ];
+}
+
 function waitForEventAndRunStep(eventName, element, func, stepTest)
 {
     var eventCallback = function(event) {
         if (func)
             func(event);
     }
     if (stepTest)
         eventCallback = stepTest.step_func(eventCallback);
 
     element.addEventListener(eventName, eventCallback, true);
@@ skipping 177 matching lines @@
 // Create a MediaKeys object for Clear Key with 1 session. KeyId and key
 // required for the video are already known and provided. Returns a promise
 // that resolves to the MediaKeys object created.
 function createMediaKeys(keyId, key)
 {
     var mediaKeys;
     var mediaKeySession;
     var request = stringToUint8Array(createKeyIDs(keyId));
     var jwkSet = stringToUint8Array(createJWKSet(createJWK(keyId, key)));
 
-    return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]).then(function(access) {
+    return navigator.requestMediaKeySystemAccess('org.w3.clearkey', simpleConfigurationForInitDataType('keyids')).then(function(access) {
         return access.createMediaKeys();
     }).then(function(result) {
         mediaKeys = result;
         mediaKeySession = mediaKeys.createSession();
         return mediaKeySession.generateRequest('keyids', request);
     }).then(function() {
         return mediaKeySession.update(jwkSet);
     }).then(function() {
         return Promise.resolve(mediaKeys);
     });
 }
 
 // Play the specified |content| on |video|. Returns a promise that is resolved
 // after the video plays for |duration| seconds.
 function playVideoAndWaitForTimeupdate(video, content, duration)
 {
     video.src = content;
     video.play();
     return new Promise(function(resolve) {
         video.addEventListener('timeupdate', function listener(event) {
             if (event.target.currentTime < duration)
                 return;
             video.removeEventListener('timeupdate', listener);
             resolve('success');
         });
     });
 }