Cleanup verifyKeyStatuses() to take KeyId/status pairs

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

Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js
index 38d1c9912ce5398e3dab4f02d95fa27cf3436b0a..a8d5829fe0db9d51847119e60c4436e9176bd208 100644
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js
+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js
@@ -181,28 +181,18 @@ function dumpKeyStatuses(keyStatuses)
     });
 }
 
-// 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);
   });
 }