From a310d932fe82f668517caeb820ff248522a29909 Mon Sep 17 00:00:00 2001
From: Gerald Squelart <from_mozilla@squelart.com>
Date: Thu, 26 Mar 2015 18:58:00 -0400
Subject: [PATCH] Bug 1144409 - Test that encrypted events are fired for each
 initData. r=edwin

---
 dom/media/test/manifest.js            | 4 ++++
 dom/media/test/test_eme_playback.html | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
index a8f1cebc7f3..b129117fc46 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -664,6 +664,7 @@ var gEMETests = [
       "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
     },
     sessionType:"temporary",
+    sessionCount:1,
     duration:1.60,
   },
   {
@@ -684,6 +685,7 @@ var gEMETests = [
       "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
     },
     sessionType:"temporary",
+    sessionCount:1,
     crossOrigin:true,
     duration:1.60,
   },
@@ -714,6 +716,7 @@ var gEMETests = [
       "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
     },
     sessionType:"temporary",
+    sessionCount:2,
     duration:1.60,
   },
   {
@@ -743,6 +746,7 @@ var gEMETests = [
       "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
     },
     sessionType:"temporary",
+    sessionCount:2,
     crossOrigin:true,
     duration:1.60,
   },
diff --git a/dom/media/test/test_eme_playback.html b/dom/media/test/test_eme_playback.html
index 1a4ea80932f..0010b76af21 100644
--- a/dom/media/test/test_eme_playback.html
+++ b/dom/media/test/test_eme_playback.html
@@ -48,11 +48,11 @@ function startTest(test, token)
     }
   );
 
-  var gotEncrypted = false;
+  var gotEncrypted = 0;
   var gotPlaying = false;
 
   v.addEventListener("encrypted", function(ev) {
-    gotEncrypted = true;
+    gotEncrypted += 1;
   });
 
   v.addEventListener("playing", function () { gotPlaying = true; });
@@ -66,7 +66,9 @@ function startTest(test, token)
   v.addEventListener("ended", function(ev) {
     ok(true, TimeStamp(token) + " got ended event");
 
-    ok(gotEncrypted, TimeStamp(token) + " encrypted event should have fired");
+    is(gotEncrypted, test.sessionCount,
+       TimeStamp(token) + " encrypted events expected: " + test.sessionCount
+       + ", actual: " + gotEncrypted);
     ok(gotPlaying, TimeStamp(token) + " playing event should have fired");
 
     ok(Math.abs(test.duration - v.duration) < 0.1,