[eme] Convert lifetime tests to promise_tests

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html

Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
index b1235fb99fb4eb600b4cb195d8fef256044d6017..07128654ed66fe87f302ebe244b2f95c341e7cc1 100644
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html
@@ -13,29 +13,21 @@
             //   OR (MediaKeys is around
             //       AND the session has not received a close() event)
 
-            async_test(function(test)
+            promise_test(function(test)
             {
-                gc();
                 var mediaKeys;
                 var mediaKeySession1;
                 var mediaKeySession2;
                 var mediaKeySession3;
                 var initDataType;
                 var initData;
-                var startingMediaKeysCount = window.internals.mediaKeysCount();
-                var startingMediaKeySessionCount = window.internals.mediaKeySessionCount();
 
-                function numMediaKeysCreated()
-                {
-                    return window.internals.mediaKeysCount() - startingMediaKeysCount;
-                }
+                return createGCPromise().then(function() {
+                    assert_equals(window.internals.mediaKeysCount(), 0, 'After initial gc()');
+                    assert_equals(window.internals.mediaKeySessionCount(), 0, 'After initial gc()');
 
-                function numMediaKeySessionCreated()
-                {
-                    return window.internals.mediaKeySessionCount() - startingMediaKeySessionCount;
-                }
-
-                navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration()).then(function(access) {
+                    return navigator.requestMediaKeySystemAccess('org.w3.clearkey', getSimpleConfiguration());
+                }).then(function(access) {
                     initDataType = access.getConfiguration().initDataTypes[0];
                     initData = getInitData(initDataType);
                     return access.createMediaKeys();
@@ -43,8 +35,8 @@
                     mediaKeys = result;
                     assert_equals(typeof mediaKeys.createSession, 'function');
 
-                    assert_equals(numMediaKeysCreated(), 1, 'MediaKeys.create()');
-                    assert_equals(numMediaKeySessionCreated(), 0, 'After final gc()');
+                    assert_equals(window.internals.mediaKeysCount(), 1, 'MediaKeys.create()');
+                    assert_equals(window.internals.mediaKeySessionCount(), 0, 'After final gc()');

[xhwang, 2017/01/05 20:05:06]

There two are used in multiple places in multiple tests. Does it make sense to
add two helper functions in encrypted-media-utils.js to make it shorter?

e.g. 

function mediaKeysCount()
{
  return window.internals.mediaKeysCount();
}

[jrummell, 2017/01/06 22:10:18]

Not sure that a shorter name helps that much. However, I moved the asserts into
a separate function. (Note that the assert output doesn't contain line numbers,
so |description| is important to determine which assert failed. Now output looks
like "FAIL MediaKeys lifetime with session assert_equals: After gc(),
MediaKeySession: expected 2 but got 1").

[xhwang, 2017/01/09 17:57:17]

This looks much cleaner!

Does it make sense to move this helper function to encrypted-media-utils.js to
further reduce duplication?

 
                     // Create 3 sessions.
                     mediaKeySession1 = mediaKeys.createSession();
@@ -52,32 +44,32 @@
                 }).then(function() {
                     assert_true(mediaKeySession1.sessionId && mediaKeySession1.sessionId.length > 0);
 
-                    assert_equals(numMediaKeysCreated(), 1, 'MediaKeys.createSession(1)');
-                    assert_equals(numMediaKeySessionCreated(), 1, 'MediaKeys.createSession(1)');
+                    assert_equals(window.internals.mediaKeysCount(), 1, 'MediaKeys.createSession(1)');
+                    assert_equals(window.internals.mediaKeySessionCount(), 1, 'MediaKeys.createSession(1)');
 
                     mediaKeySession2 = mediaKeys.createSession();
                     return mediaKeySession2.generateRequest(initDataType, initData);
                 }).then(function() {
                     assert_true(mediaKeySession2.sessionId && mediaKeySession2.sessionId.length > 0);
 
-                    assert_equals(numMediaKeysCreated(), 1, 'mediaKeys.createSession(2)');
-                    assert_equals(numMediaKeySessionCreated(), 2, 'mediaKeys.createSession(2)');
+                    assert_equals(window.internals.mediaKeysCount(), 1, 'mediaKeys.createSession(2)');
+                    assert_equals(window.internals.mediaKeySessionCount(), 2, 'mediaKeys.createSession(2)');
 
                     mediaKeySession3 = mediaKeys.createSession();
                     return mediaKeySession3.generateRequest(initDataType, initData);
                 }).then(function() {
                     assert_true(mediaKeySession3.sessionId && mediaKeySession3.sessionId.length > 0);
 
-                    assert_equals(numMediaKeysCreated(), 1, 'mediaKeys.createSession(3)');
-                    assert_equals(numMediaKeySessionCreated(), 3, 'mediaKeys.createSession(3)');
+                    assert_equals(window.internals.mediaKeysCount(), 1, 'mediaKeys.createSession(3)');
+                    assert_equals(window.internals.mediaKeySessionCount(), 3, 'mediaKeys.createSession(3)');
 
                     // Run gc(). All sessions should remain as we have a
                     // reference to each one. However, running gc()
                     // asynchronously should free up the last PromiseResolver.
                     return createGCPromise();
                 }).then(function(result) {
-                    assert_equals(numMediaKeysCreated(), 1, 'After gc()');
-                    assert_equals(numMediaKeySessionCreated(), 3, 'After gc()');
+                    assert_equals(window.internals.mediaKeysCount(), 1, 'After gc()');
+                    assert_equals(window.internals.mediaKeySessionCount(), 3, 'After gc()');
 
                     // Now drop references to 2 of the sessions. Even though we
                     // don't have a reference, MediaKeys is still around (and
@@ -89,8 +81,8 @@
                 }).then(function(result) {
                     return createGCPromise();
                 }).then(function(result) {
-                    assert_equals(numMediaKeysCreated(), 1, 'After second gc()');
-                    assert_equals(numMediaKeySessionCreated(), 3, 'After second gc()');
+                    assert_equals(window.internals.mediaKeysCount(), 1, 'After second gc()');
+                    assert_equals(window.internals.mediaKeySessionCount(), 3, 'After second gc()');
 
                     // Now drop the reference to MediaKeys. It and the 2
                     // unreferenced sessions should be collected. Since
@@ -105,20 +97,16 @@
                 }).then(function(result) {
                     return createGCPromise();
                 }).then(function(result) {
-                    assert_equals(numMediaKeysCreated(), 0, 'After mediaKeys = null');
-                    assert_equals(numMediaKeySessionCreated(), 1, 'After mediaKeys = null');
+                    assert_equals(window.internals.mediaKeysCount(), 0, 'After mediaKeys = null');
+                    assert_equals(window.internals.mediaKeySessionCount(), 1, 'After mediaKeys = null');
 
                     // Drop the reference to the last session. It should get
                     // collected now since MediaKeys is gone.
                     mediaKeySession3 = null;
                     return createGCPromise();
                 }).then(function(result) {
-                    assert_equals(numMediaKeysCreated(), 0, 'After final gc()');
-                    assert_equals(numMediaKeySessionCreated(), 0, 'After final gc()');
-
-                    test.done();
-                }).catch(function(error) {
-                    forceTestFailureFromPromise(test, error);
+                    assert_equals(window.internals.mediaKeysCount(), 0, 'After final gc()');
+                    assert_equals(window.internals.mediaKeySessionCount(), 0, 'After final gc()');
                 });
             }, 'MediaKeySession lifetime without release()');
         </script>