From c86c4cf058e792793112baa0cef6b8409729e365 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 23 Dec 2014 17:32:54 -0500
Subject: [PATCH] Bug 1113446 - Make sure that SimpleTest.waitForClipboard
 cannot trigger bad setTimeout messages; r=ted

--HG--
extra : rebase_source : 2c36df39f5f9aec17d6801b6b5f9beafbef1b5cc
---
 testing/mochitest/tests/SimpleTest/SimpleTest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
index b8c7e65f31c3..55197a1b6f9f 100644
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -820,7 +820,7 @@ SimpleTest.waitForClipboard = function(aExpectedStringOrValidatorFn, aSetupFn,
             reset();
             successFn();
         } else {
-            setTimeout(function() { return wait(validatorFn, successFn, failureFn, flavor); }, 100);
+            SimpleTest._originalSetTimeout.apply(window, [function() { return wait(validatorFn, successFn, failureFn, flavor); }, 100]);
         }
     }