Make HTMLMediaElement.setMediaKeys() asynchronous.

LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html

Index: LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html
diff --git a/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html b/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html
index 92d7f982a7819ef461e96984f2addbfa9d6fe6ed..c41592eafc57faeb827420422f557be7311ef681 100644
--- a/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html
@@ -23,24 +23,32 @@
                 assert_equals(typeof video.setMediaKeys, 'function');
 
                 // Try setting mediaKeys to null.
-                video.setMediaKeys(null);
-                assert_equals(video.mediaKeys, null);
+                video.setMediaKeys(null).then(function(result) {
+                    assert_equals(video.mediaKeys, null);
 
-                // Try setting mediaKeys to the wrong type of object.
-                assert_throws(new TypeError(),
-                              function () { video.setMediaKeys(new Date()) });
+                    // Try setting mediaKeys to the wrong type of object.
+                    return video.setMediaKeys(new Date());
+                }).then(function(result) {
+                    assert_unreached('setMediaKeys did not fail when setting to Date()');
+                }, function(error) {
+                    // TypeError expected.
+                    assert_equals(error.name, 'TypeError');
 
-                // Create a MediaKeys object and assign it to video.
-                MediaKeys.create('org.w3.clearkey').then(function(result) {
+                    // Create a MediaKeys object and assign it to video.
+                    return MediaKeys.create('org.w3.clearkey');
+                }).then(function(result) {
                     mediaKeys = result;
                     assert_not_equals(mediaKeys, null);
                     assert_equals(mediaKeys.keySystem, 'org.w3.clearkey');
-                    video.setMediaKeys(mediaKeys);
+                    video.src = '../content/test-encrypted.webm';

[ddorwin, 2014/08/08 02:50:50]

Is this necessary?

[jrummell, 2014/08/08 23:15:11]

Nope. Removed.

+                    return video.setMediaKeys(mediaKeys);
+                }).then(function(result) {
                     assert_not_equals(video.mediaKeys, null);
                     assert_true(video.mediaKeys === mediaKeys);
 
                     // Set it a second time.
-                    video.setMediaKeys(mediaKeys);
+                    return video.setMediaKeys(mediaKeys);
+                }).then(function(result) {
                     assert_not_equals(video.mediaKeys, null);
                     assert_true(video.mediaKeys === mediaKeys);
 
@@ -55,26 +63,37 @@
                     assert_equals(mediaKeys2.keySystem, 'org.w3.clearkey');
 
                     // Assign the second MediaKeys to video.
-                    video.setMediaKeys(mediaKeys2);
+                    return video.setMediaKeys(mediaKeys2);
+                }).then(function(result) {
                     assert_not_equals(video.mediaKeys, null);
                     assert_not_equals(video.mediaKeys, mediaKeys);
                     assert_true(video.mediaKeys === mediaKeys2);
 
                     // Set it back to first MediaKeys.
-                    video.setMediaKeys(mediaKeys);
+                    return video.setMediaKeys(mediaKeys);
+                }, function(error) {
+                    // Some implementations don't support changing MediaKeys
+                    // once set, so this test is a success.
+                    assert_equals(error.name, "NotSupportedError");
+                    test.done();

[ddorwin, 2014/08/08 02:50:50]

If we return, we can still run the null test at l84. Even if replacement is not
supported, setting to null may be.

We might also consider doing what's right for Chrome for now and modifying the
test if necessary when submitting it. We want to make sure Chrome does what we
expect. Alternatively, we could do that in a browser test.

Note that since we are not playing (and without line34, it is not loaded, most
implementations will probably succeed here. Hmm, maybe we should run some of
these again AFTER setting the source and AFTER playing. (We can do this in a
separate CL.) 

[jrummell, 2014/08/08 23:15:11]

Updated test to fail, along with a FIXME as a reminder.

+                }).then(function(result) {
+

[ddorwin, 2014/08/08 02:50:50]

remove

[jrummell, 2014/08/08 23:15:11]

Done.

                     assert_true(video.mediaKeys === mediaKeys);
                     assert_not_equals(video.mediaKeys, mediaKeys2);
 
                     // Set mediaKeys to null.
-                    video.setMediaKeys(null);
+                    return video.setMediaKeys(null);
+                }).then(function(result) {
                     assert_equals(video.mediaKeys, null);
 
                     // Set it to null a second time.
-                    video.setMediaKeys(null);
+                    return video.setMediaKeys(null);
+                }).then(function(result) {
                     assert_equals(video.mediaKeys, null);
 
                     // Set it back to first MediaKeys again.
-                    video.setMediaKeys(mediaKeys);
+                    return video.setMediaKeys(mediaKeys);
+                }).then(function(result) {
                     assert_true(video.mediaKeys === mediaKeys);
                     assert_not_equals(video.mediaKeys, mediaKeys2);
                     test.done();