Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / media / encrypted-media / encrypted-media-playback-setmediakeys-after-src.html

diff --git a/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-after-src.html b/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-after-src.html
index 6f7528e..64c7819 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-after-src.html
+++ b/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-after-src.html
@@ -14,27 +14,30 @@
             async_test(function(test)
             {
                 var video = document.getElementById('testVideo');
-                var isSessionCreated = false;
                 var isUpdatePromiseResolved = false;
+                var encryptedEventCount = 0;
 
                 var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
                                              0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);
 
-                function onNeedKey(event)
+                function onEncrypted(event)
                 {
                     assert_equals(event.target, video);
-                    assert_true(event instanceof window.MediaKeyNeededEvent);
-                    assert_equals(event.type, 'needkey');
+                    assert_true(event instanceof window.MediaEncryptedEvent);
+                    assert_equals(event.type, 'encrypted');
 
-                    // The same decryption key is shared by all streams so
-                    // only create a shared session once.
-                    if (isSessionCreated)
+                    // The same decryption key is used by both the audio and
+                    // the video streams so only create a session once. To
+                    // avoid issues when comparing the expected.txt file
+                    // (which logs the events in the order they occur), create
+                    // the session on the second event. This also ensures we
+                    // see both events.
+                    if (++encryptedEventCount != 2)
                         return;
-                    isSessionCreated = true;
 
                     var mediaKeySession = video.mediaKeys.createSession();
                     waitForEventAndRunStep('message', mediaKeySession, onMessage, test);
-                    mediaKeySession.generateRequest(event.contentType, event.initData).catch(function(error) {
+                    mediaKeySession.generateRequest(event.initDataType, event.initData).catch(function(error) {
                         forceTestFailureFromPromise(test, error);
                     });
                 }
@@ -68,9 +71,11 @@
                     test.done();
                 }
 
-                MediaKeys.create('org.w3.clearkey').then(function(mediaKeys) {
+                navigator.requestMediaKeySystemAccess('org.w3.clearkey').then(function(access) {
+                    return access.createMediaKeys();
+                }).then(function(mediaKeys) {
 
-                    waitForEventAndRunStep('needkey', video, onNeedKey, test);
+                    waitForEventAndRunStep('encrypted', video, onEncrypted, test);
                     waitForEventAndRunStep('playing', video, onPlaying, test);
 
                     video.src = '../content/test-encrypted.webm';