From 07d6939eea4c10b1fab9ed5cae60961ec55b884e Mon Sep 17 00:00:00 2001
From: Martijn Wargers <mwargers@mozilla.com>
Date: Mon, 11 Aug 2014 11:33:50 -0700
Subject: [PATCH] Bug 1032878 - Fix for test_mediatrack_events.html. r=smaug

---
 content/media/test/test_mediatrack_events.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/content/media/test/test_mediatrack_events.html b/content/media/test/test_mediatrack_events.html
index 90eea9dbd2c3..39d4d01cf097 100644
--- a/content/media/test/test_mediatrack_events.html
+++ b/content/media/test/test_mediatrack_events.html
@@ -67,6 +67,14 @@ function startTest() {
         element.onended = null;
         element.onplaying = null;
         element.onpause = null;
+        //This helps to prevent these events from firing after SimpleTest.finish()
+        //on B2G ICS Emulator, but not sure they have been run at all, then
+        element.audioTracks.onremovetrack = null;
+        element.audioTracks.onaddtrack = null;
+        element.audioTracks.onchange = null;
+        element.videoTracks.onremovetrack = null;
+        element.videoTracks.onaddtrack = null;
+        element.videoTracks.onchange = null;
         SimpleTest.finish();
       }