Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html b/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
index 0826df8..17f8d5a 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
+++ b/src/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
@@ -31,9 +31,9 @@
                         return;
                     isSessionCreated = true;
 
-                    video.mediaKeys.createSession(event.contentType, event.initData).then(function(mediaKeySession) {
-                        waitForEventAndRunStep('message', mediaKeySession, onMessage, test);
-                    }).catch(function(error) {
+                    var mediaKeySession = video.mediaKeys.createSession();
+                    waitForEventAndRunStep('message', mediaKeySession, onMessage, test);
+                    mediaKeySession.generateRequest(event.contentType, event.initData).catch(function(error) {
                         forceTestFailureFromPromise(test, error);
                     });
                 }
@@ -72,7 +72,8 @@
                     waitForEventAndRunStep('needkey', video, onNeedKey, test);
                     waitForEventAndRunStep('playing', video, onPlaying, test);
 
-                    video.setMediaKeys(mediaKeys);
+                    return video.setMediaKeys(mediaKeys);
+                }).then(function(result) {
                     video.src = '../content/test-encrypted.webm';
                     video.play();
                 }).catch(function(error) {