From 3fc976b0b414c5b7691bd108f5cf305c17d1f742 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Sat, 21 Jan 2012 01:44:19 -0500
Subject: [PATCH] Bug 720069 - Fix intermittent oranges in
 test_browserFrame{1,2,3}.html. r=philor

---
 .../mochitest/general/test_browserFrame1.html    | 16 ++++++++--------
 .../mochitest/general/test_browserFrame2.html    | 16 ++++++++--------
 .../mochitest/general/test_browserFrame3.html    | 16 ++++++++--------
 .../mochitest/general/test_browserFrame4.html    |  4 ++--
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/dom/tests/mochitest/general/test_browserFrame1.html b/dom/tests/mochitest/general/test_browserFrame1.html
index 3c1f52367f28..bf146eea2105 100644
--- a/dom/tests/mochitest/general/test_browserFrame1.html
+++ b/dom/tests/mochitest/general/test_browserFrame1.html
@@ -16,8 +16,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=710231
   mozbrowserX events.
 -->
 
-<iframe id='iframe' onload='iframeLoad()'></iframe>
-
 <script type="application/javascript;version=1.7">
 "use strict";
 
@@ -29,17 +27,19 @@ function runTest() {
     ok(false, 'Should not send mozbrowserloadstart event.');
   });
 
+  iframe.addEventListener('load', function() {
+    ok(true, 'Got iframe load event.');
+    SimpleTest.finish();
+  });
+
   iframe.src = 'http://example.com';
 }
 
-function iframeLoad() {
-  ok(true, 'Got iframe load event.');
-  SimpleTest.finish();
-}
-
-addEventListener('load', runTest());
+addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
 </script>
 
+<iframe id='iframe'></iframe>
+
 </body>
 </html>
diff --git a/dom/tests/mochitest/general/test_browserFrame2.html b/dom/tests/mochitest/general/test_browserFrame2.html
index 01b90cf3f0b3..4cc953c7dc90 100644
--- a/dom/tests/mochitest/general/test_browserFrame2.html
+++ b/dom/tests/mochitest/general/test_browserFrame2.html
@@ -17,8 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=710231
   mozbrowserX events when they're globally pref'ed off.
 -->
 
-<iframe id='iframe' mozbrowser onload='iframeLoad()'></iframe>
-
 <script type="application/javascript;version=1.7">
 "use strict";
 
@@ -32,17 +30,19 @@ function runTest() {
     ok(false, 'Should not send mozbrowserloadstart event.');
   });
 
+  iframe.addEventListener('load', function() {
+    ok(true, 'Got iframe load event.');
+    SimpleTest.finish();
+  });
+
   iframe.src = 'http://example.com';
 }
 
-function iframeLoad() {
-  ok(true, 'Got iframe load event.');
-  SimpleTest.finish();
-}
-
-addEventListener('load', runTest());
+addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
 </script>
 
+<iframe id='iframe' mozbrowser></iframe>
+
 </body>
 </html>
diff --git a/dom/tests/mochitest/general/test_browserFrame3.html b/dom/tests/mochitest/general/test_browserFrame3.html
index 06ba85f3c77b..a486be25a227 100644
--- a/dom/tests/mochitest/general/test_browserFrame3.html
+++ b/dom/tests/mochitest/general/test_browserFrame3.html
@@ -17,8 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=710231
   mozbrowserX events when this page is not in the whitelist.
 -->
 
-<iframe id='iframe' mozbrowser onload='iframeLoad()'></iframe>
-
 <script type="application/javascript;version=1.7">
 "use strict";
 
@@ -33,17 +31,19 @@ function runTest() {
     ok(false, 'Should not send mozbrowserloadstart event.');
   });
 
+  iframe.addEventListener('load', function() {
+    ok(true, 'Got iframe load event.');
+    SimpleTest.finish();
+  });
+
   iframe.src = 'http://example.com';
 }
 
-function iframeLoad() {
-  ok(true, 'Got iframe load event.');
-  SimpleTest.finish();
-}
-
-addEventListener('load', runTest());
+addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
 </script>
 
+<iframe id='iframe' mozbrowser></iframe>
+
 </body>
 </html>
diff --git a/dom/tests/mochitest/general/test_browserFrame4.html b/dom/tests/mochitest/general/test_browserFrame4.html
index 1285f1288772..3c48dc705ae0 100644
--- a/dom/tests/mochitest/general/test_browserFrame4.html
+++ b/dom/tests/mochitest/general/test_browserFrame4.html
@@ -17,8 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=710231
   mozbrowserX events when this page is in the whitelist.
 -->
 
-<iframe id='iframe' mozbrowser></iframe>
-
 <script type="application/javascript;version=1.7">
 "use strict";
 
@@ -83,5 +81,7 @@ addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
 </script>
 
+<iframe id='iframe' mozbrowser></iframe>
+
 </body>
 </html>