Improve reliability of EME tests

The logs for these EME tests expect all the "onencrypted" events to
occur before the "message" event is received. Modify the tests to
create the session on the second event rather than the first, to avoid
the "message" event occasionally happening before the second
"onencrypted" event".

BUG=407993
TEST=modified tests still pass

Review URL: https://codereview.chromium.org/634243005

git-svn-id: svn://svn.chromium.org/blink/trunk@183833 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html

@@ -15,8 +15,8 @@
             {
                 var video = document.getElementById('testVideo');
                 var mediaKeySession = null;
-                var isSessionCreated = false;
                 var sessionReadyReceived = false;
+                var encryptedEventCount = 0;
 
                 var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
                                              0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);
@@ -27,11 +27,14 @@
                     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;
 
                     mediaKeySession = video.mediaKeys.createSession();
                     waitForEventAndRunStep('message', mediaKeySession, onMessage, test);

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-after-src.html

@@ -14,8 +14,8 @@
             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]);
@@ -26,11 +26,14 @@
                     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);

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html

@@ -14,8 +14,8 @@
             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]);
@@ -26,10 +26,14 @@
                     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);

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key.html

@@ -14,8 +14,8 @@
             {
                 var video = document.getElementById('testVideo');
                 var mediaKeySession = null;
-                var sessionCreated = false;
                 var sessionReadyReceived = false;
+                var encryptedEventCount = 0;
 
                 var keyId = null;
                 var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
@@ -27,11 +27,14 @@
                     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 (sessionCreated)
+                    // 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;
-                    sessionCreated = true;
 
                     mediaKeySession = video.mediaKeys.createSession();
                     waitForEventAndRunStep('message', mediaKeySession, onMessage, test);