Cleanup verifyKeyStatuses() to take KeyId/status pairs

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 163 matching lines @@
     consoleWrite("for (var entry of keyStatuses.entries())");
     for (var entry of keyStatuses.entries()) {
         consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
     }
     consoleWrite("keyStatuses.forEach()");
     keyStatuses.forEach(function(status, keyId) {
         consoleWrite(arrayBufferAsString(keyId) + ": " + status);
     });
 }
 
-// Verify that |keyStatuses| contains just the keys in |keys.expected|
-// and none of the keys in |keys.unexpected|. All expected keys should have
-// status |status|. Example call: verifyKeyStatuses(mediaKeySession.keyStatuses,
-// { expected: [key1], unexpected: [key2] }, 'usable');
-function verifyKeyStatuses(keyStatuses, keys, status) {
-  var expected = keys.expected || [];
-  var unexpected = keys.unexpected || [];
-  status = status || 'usable';
-
+// Verify that |keyStatuses| contains just the keys in the array |expected|.
+// Each entry specifies the keyId and status expected.
+// Example call: verifyKeyStatuses(mediaKeySession.keyStatuses,
+//   [{keyId: key1, status: 'usable'}, {keyId: key2, status: 'released'}]);
+function verifyKeyStatuses(keyStatuses, expected) {
   // |keyStatuses| should have same size as number of |keys.expected|.
   assert_equals(keyStatuses.size, expected.length);
 
-  // All |keys.expected| should be found.
-  expected.map(function(key) {
-    assert_true(keyStatuses.has(key));
-    assert_equals(keyStatuses.get(key), status);
-  });
-
-  // All |keys.unexpected| should not be found.
-  unexpected.map(function(key) {
-    assert_false(keyStatuses.has(key));
-    assert_equals(keyStatuses.get(key), undefined);
+  // All |expected| should be found.
+  expected.map(function(item) {
+    assert_true(keyStatuses.has(item.keyId));
+    assert_equals(keyStatuses.get(item.keyId), item.status);
   });
 }
 
 // Encodes |data| into base64url string. There is no '=' padding, and the
 // characters '-' and '_' must be used instead of '+' and '/', respectively.
 function base64urlEncode(data)
 {
     var result = btoa(String.fromCharCode.apply(null, data));
     return result.replace(/=+$/g, '').replace(/\+/g, "-").replace(/\//g, "_");
 }
@@ skipping 131 matching lines @@
 function verifyMediaKeyAndMediaKeySessionCount(
     expectedMediaKeysCount, expectedMediaKeySessionCount, description)
 {
     assert_equals(window.internals.mediaKeysCount(),
                   expectedMediaKeysCount,
                   description + ', MediaKeys:');
     assert_equals(window.internals.mediaKeySessionCount(),
                   expectedMediaKeySessionCount,
                   description + ', MediaKeySession:');
 }