From 968baa3e669d47da5a453d01ee1b66f29b93733b Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 7 Jun 2012 20:04:30 -0400
Subject: [PATCH] Backed out changeset b40369a421bd (bug 762049)

--HG--
rename : dom/browser-element/mochitest/browserElement_SetVisible.js => dom/browser-element/mochitest/test_browserFrame10.html
rename : dom/browser-element/mochitest/browserElement_LoadEvents.js => dom/browser-element/mochitest/test_browserFrame4.html
rename : dom/browser-element/mochitest/browserElement_DataURI.js => dom/browser-element/mochitest/test_browserFrame5.html
rename : dom/browser-element/mochitest/browserElement_Titlechange.js => dom/browser-element/mochitest/test_browserFrame6.html
rename : dom/browser-element/mochitest/browserElement_TopBarrier.js => dom/browser-element/mochitest/test_browserFrame7.html
rename : dom/browser-element/mochitest/browserElement_Iconchange.js => dom/browser-element/mochitest/test_browserFrame8.html
rename : dom/browser-element/mochitest/browserElement_GetScreenshot.js => dom/browser-element/mochitest/test_browserFrame9.html
rename : dom/browser-element/mochitest/browserElement_Alert.js => dom/browser-element/mochitest/test_browserFrameAlert.html
rename : dom/browser-element/mochitest/browserElement_PromptCheck.js => dom/browser-element/mochitest/test_browserFramePromptCheck.html
rename : dom/browser-element/mochitest/browserElement_PromptConfirm.js => dom/browser-element/mochitest/test_browserFramePromptConfirm.html
rename : dom/browser-element/mochitest/browserElement_KeyEvents.js => dom/browser-element/mochitest/test_browserFrame_keyEvents.html
---
 dom/browser-element/mochitest/Makefile.in     | 52 +++++--------------
 .../mochitest/browserElement_Close.js         | 22 --------
 .../mochitest/browserFrameHelpers.js          | 14 ++---
 .../test_browserElement_inproc_Alert.html     | 18 -------
 .../test_browserElement_inproc_Close.html     | 18 -------
 .../test_browserElement_inproc_DataURI.html   | 18 -------
 ...t_browserElement_inproc_GetScreenshot.html | 19 -------
 ...test_browserElement_inproc_Iconchange.html | 19 -------
 .../test_browserElement_inproc_KeyEvents.html | 20 -------
 ...test_browserElement_inproc_LoadEvents.html | 18 -------
 ...est_browserElement_inproc_PromptCheck.html | 18 -------
 ...t_browserElement_inproc_PromptConfirm.html | 18 -------
 ...test_browserElement_inproc_SetVisible.html | 19 -------
 ...est_browserElement_inproc_Titlechange.html | 19 -------
 ...test_browserElement_inproc_TopBarrier.html | 21 --------
 .../test_browserElement_oop_Alert.html        | 18 -------
 .../test_browserElement_oop_Close.html        | 18 -------
 .../test_browserElement_oop_DataURI.html      | 18 -------
 ...test_browserElement_oop_GetScreenshot.html | 19 -------
 .../test_browserElement_oop_Iconchange.html   | 19 -------
 .../test_browserElement_oop_KeyEvents.html    | 20 -------
 .../test_browserElement_oop_LoadEvents.html   | 19 -------
 .../test_browserElement_oop_PromptCheck.html  | 18 -------
 ...test_browserElement_oop_PromptConfirm.html | 18 -------
 .../test_browserElement_oop_SetVisible.html   | 19 -------
 .../test_browserElement_oop_Titlechange.html  | 19 -------
 .../test_browserElement_oop_TopBarrier.html   | 20 -------
 ...SetVisible.js => test_browserFrame10.html} | 24 ++++++++-
 ..._LoadEvents.js => test_browserFrame4.html} | 37 +++++++++++--
 ...ent_DataURI.js => test_browserFrame5.html} | 36 ++++++++++---
 ...Titlechange.js => test_browserFrame6.html} | 23 +++++++-
 ..._TopBarrier.js => test_browserFrame7.html} | 24 ++++++++-
 ..._Iconchange.js => test_browserFrame8.html} | 26 +++++++++-
 ...tScreenshot.js => test_browserFrame9.html} | 24 ++++++++-
 ...t_Alert.js => test_browserFrameAlert.html} | 24 ++++++++-
 .../mochitest/test_browserFrameClose.html     | 43 +++++++++++++++
 ...k.js => test_browserFramePromptCheck.html} | 34 +++++++++---
 ...js => test_browserFramePromptConfirm.html} | 31 +++++++++--
 ...ts.js => test_browserFrame_keyEvents.html} | 27 +++++++++-
 39 files changed, 337 insertions(+), 554 deletions(-)
 delete mode 100644 dom/browser-element/mochitest/browserElement_Close.js
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_Alert.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_Close.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_DataURI.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_Iconchange.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_KeyEvents.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_LoadEvents.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_PromptCheck.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_PromptConfirm.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_SetVisible.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_Titlechange.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_TopBarrier.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_Alert.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_Close.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_DataURI.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_GetScreenshot.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_Iconchange.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_KeyEvents.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_LoadEvents.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_PromptCheck.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_PromptConfirm.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_SetVisible.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_Titlechange.html
 delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_TopBarrier.html
 rename dom/browser-element/mochitest/{browserElement_SetVisible.js => test_browserFrame10.html} (72%)
 rename dom/browser-element/mochitest/{browserElement_LoadEvents.js => test_browserFrame4.html} (80%)
 rename dom/browser-element/mochitest/{browserElement_DataURI.js => test_browserFrame5.html} (68%)
 rename dom/browser-element/mochitest/{browserElement_Titlechange.js => test_browserFrame6.html} (78%)
 rename dom/browser-element/mochitest/{browserElement_TopBarrier.js => test_browserFrame7.html} (79%)
 rename dom/browser-element/mochitest/{browserElement_Iconchange.js => test_browserFrame8.html} (86%)
 rename dom/browser-element/mochitest/{browserElement_GetScreenshot.js => test_browserFrame9.html} (75%)
 rename dom/browser-element/mochitest/{browserElement_Alert.js => test_browserFrameAlert.html} (87%)
 create mode 100644 dom/browser-element/mochitest/test_browserFrameClose.html
 rename dom/browser-element/mochitest/{browserElement_PromptCheck.js => test_browserFramePromptCheck.html} (62%)
 rename dom/browser-element/mochitest/{browserElement_PromptConfirm.js => test_browserFramePromptConfirm.html} (75%)
 rename dom/browser-element/mochitest/{browserElement_KeyEvents.js => test_browserFrame_keyEvents.html} (74%)

diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in
index 835aa1674751..113675429ddb 100644
--- a/dom/browser-element/mochitest/Makefile.in
+++ b/dom/browser-element/mochitest/Makefile.in
@@ -12,10 +12,6 @@ relativesrcdir  = dom/browser-element/mochitest
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-# Note: browserFrameHelpers.js looks at the test's filename to determine
-# whether the test should be OOP.  "_oop_" signals OOP, "_inproc_" signals in
-# process.  Default is OOP.
-
 _TEST_FILES = \
 		file_empty.html \
 		file_focus.html \
@@ -23,42 +19,18 @@ _TEST_FILES = \
 		test_browserElement_NoAttr.html \
 		test_browserElement_NoPref.html \
 		test_browserElement_NoWhitelist.html \
-		browserElement_LoadEvents.js \
-		test_browserElement_oop_LoadEvents.html \
-		test_browserElement_inproc_LoadEvents.html \
-		browserElement_DataURI.js \
-		test_browserElement_oop_DataURI.html \
-		test_browserElement_inproc_DataURI.html \
-		browserElement_Titlechange.js \
-		test_browserElement_oop_Titlechange.html \
-		test_browserElement_inproc_Titlechange.html \
-		browserElement_TopBarrier.js \
-		test_browserElement_oop_TopBarrier.html \
-		test_browserElement_inproc_TopBarrier.html \
-		browserElement_Iconchange.js \
-		test_browserElement_oop_Iconchange.html \
-		test_browserElement_inproc_Iconchange.html \
-		browserElement_GetScreenshot.js \
-		test_browserElement_oop_GetScreenshot.html \
-		test_browserElement_inproc_GetScreenshot.html \
-		browserElement_SetVisible.js \
-		test_browserElement_oop_SetVisible.html \
-		test_browserElement_inproc_SetVisible.html \
-		browserElement_KeyEvents.js \
-		test_browserElement_oop_KeyEvents.html \
-		test_browserElement_inproc_KeyEvents.html \
-		browserElement_Alert.js \
-		test_browserElement_oop_Alert.html \
-		test_browserElement_inproc_Alert.html \
-		browserElement_PromptCheck.js \
-		test_browserElement_oop_PromptCheck.html \
-		test_browserElement_inproc_PromptCheck.html \
-		browserElement_PromptConfirm.js \
-		test_browserElement_oop_PromptConfirm.html \
-		test_browserElement_inproc_PromptConfirm.html \
-		browserElement_Close.js \
-		test_browserElement_oop_Close.html \
-		test_browserElement_inproc_Close.html \
+		test_browserFrame4.html \
+		test_browserFrame5.html \
+		test_browserFrame6.html \
+		test_browserFrame7.html \
+		test_browserFrame8.html \
+		test_browserFrame9.html \
+		test_browserFrame10.html \
+		test_browserFrame_keyEvents.html \
+		test_browserFrameAlert.html \
+		test_browserFramePromptCheck.html \
+		test_browserFramePromptConfirm.html \
+		test_browserFrameClose.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/dom/browser-element/mochitest/browserElement_Close.js b/dom/browser-element/mochitest/browserElement_Close.js
deleted file mode 100644
index f26834817589..000000000000
--- a/dom/browser-element/mochitest/browserElement_Close.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Test that window.close() works.
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
-
-  var iframe = document.createElement('iframe');
-  iframe.mozbrowser = true;
-  document.body.appendChild(iframe);
-
-  iframe.addEventListener("mozbrowserclose", function(e) {
-    ok(true, "got mozbrowserclose event.");
-    SimpleTest.finish();
-  });
-
-  iframe.src = "data:text/html,<html><body><script>window.close()</scr"+"ipt></body></html>";
-}
-
-runTest();
diff --git a/dom/browser-element/mochitest/browserFrameHelpers.js b/dom/browser-element/mochitest/browserFrameHelpers.js
index 062cd7a6c017..af8490b95ae5 100644
--- a/dom/browser-element/mochitest/browserFrameHelpers.js
+++ b/dom/browser-element/mochitest/browserFrameHelpers.js
@@ -120,19 +120,15 @@ browserFrameHelpers.origPageThumbsEnabledPref = browserFrameHelpers.getPageThumb
 // Disable tab view; it seriously messes us up.
 browserFrameHelpers.setPageThumbsEnabledPref(false);
 
-// Enable or disable OOP depending on the test's filename.
-var oop;
-if (location.pathname.indexOf("_inproc_") != -1) {
-  oop = false;
+// OOP by default, except on Windows, where OOP doesn't work.
+browserFrameHelpers.setOOPByDefaultPref(true);
+if (navigator.platform.indexOf('Win') != -1) {
+  browserFrameHelpers.setOOPDisabledPref(true);
 }
 else {
-  // oop by default
-  oop = true;
+  browserFrameHelpers.setOOPDisabledPref(false);
 }
 
-browserFrameHelpers.setOOPByDefaultPref(oop);
-browserFrameHelpers.setOOPDisabledPref(false);
-
 addEventListener('unload', function() {
   browserFrameHelpers.restoreOriginalPrefs();
 });
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_Alert.html b/dom/browser-element/mochitest/test_browserElement_inproc_Alert.html
deleted file mode 100644
index 8b8eb2b16867..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_Alert.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=741587
--->
-<head>
-  <title>Test for Bug 741587</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_Alert.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_Close.html b/dom/browser-element/mochitest/test_browserElement_inproc_Close.html
deleted file mode 100644
index 9db34bf6e3f2..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_Close.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=757182
--->
-<head>
-  <title>Test for Bug 757182</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=757182">Mozilla Bug 757182</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_Close.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_DataURI.html b/dom/browser-element/mochitest/test_browserElement_inproc_DataURI.html
deleted file mode 100644
index 113cbf2c217e..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_DataURI.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=720157
--->
-<head>
-  <title>Test for Bug 720157</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720157">Mozilla Bug 720157</a>
-
-<script type='application/javascript;version=1.7' src='browserElement_DataURI.js'></script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html b/dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html
deleted file mode 100644
index 3507b969bf53..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=753595
--->
-<head>
-  <title>Test for Bug 753595</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=753595">Mozilla Bug 753595</a>
-
-<script type="application/javascript;version=1.7" src='browserElement_GetScreenshot.js'>
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_Iconchange.html b/dom/browser-element/mochitest/test_browserElement_inproc_Iconchange.html
deleted file mode 100644
index e43e942c29a2..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_Iconchange.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=719461
--->
-<head>
-  <title>Test for Bug 719461</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=719461">Mozilla Bug 719461</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_Iconchange.js">
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_KeyEvents.html b/dom/browser-element/mochitest/test_browserElement_inproc_KeyEvents.html
deleted file mode 100644
index cafa45b3d296..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_KeyEvents.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=757486
--->
-<head>
-  <title>Test for Bug 757486</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=757486">Mozilla Bug 757486</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_KeyEvents.js">
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_LoadEvents.html b/dom/browser-element/mochitest/test_browserElement_inproc_LoadEvents.html
deleted file mode 100644
index a7f1f9f98f39..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_LoadEvents.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=710231
--->
-<head>
-  <title>Test for Bug 710231</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=710231">Mozilla Bug 710231</a>
-
-<script type="application/javascript;version1.7" src="browserElement_LoadEvents.js"></script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_PromptCheck.html b/dom/browser-element/mochitest/test_browserElement_inproc_PromptCheck.html
deleted file mode 100644
index c76852cb12c7..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_PromptCheck.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=741587
--->
-<head>
-  <title>Test for Bug 741587</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_PromptCheck.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_PromptConfirm.html b/dom/browser-element/mochitest/test_browserElement_inproc_PromptConfirm.html
deleted file mode 100644
index 91a09c7644df..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_PromptConfirm.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=741587
--->
-<head>
-  <title>Test for Bug 741587</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_PromptConfirm.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_SetVisible.html b/dom/browser-element/mochitest/test_browserElement_inproc_SetVisible.html
deleted file mode 100644
index 082361f40c6b..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_SetVisible.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=702880
--->
- <head>
-  <title>Test for Bug 702880</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=753595">Mozilla Bug 702880</a>
-
-<script type="application/javascript;version=1.7" src='browserElement_SetVisible.js'>
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_Titlechange.html b/dom/browser-element/mochitest/test_browserElement_inproc_Titlechange.html
deleted file mode 100644
index a2b733c7ae0d..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_Titlechange.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=720157
--->
-<head>
-  <title>Test for Bug 720157</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720157">Mozilla Bug 720157</a>
-
-<script type="application/javascript;version=1.7" src='browserElement_Titlechange.js'>
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_TopBarrier.html b/dom/browser-element/mochitest/test_browserElement_inproc_TopBarrier.html
deleted file mode 100644
index bcb5b47d86fa..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_inproc_TopBarrier.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=725796
--->
-<head>
-  <title>Test for Bug 725796</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=725796">Mozilla Bug 725796</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_TopBarrier.js">
-</script>
-
-</body>
-</html>
-
-
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_Alert.html b/dom/browser-element/mochitest/test_browserElement_oop_Alert.html
deleted file mode 100644
index 8b8eb2b16867..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_Alert.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=741587
--->
-<head>
-  <title>Test for Bug 741587</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_Alert.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_Close.html b/dom/browser-element/mochitest/test_browserElement_oop_Close.html
deleted file mode 100644
index 9db34bf6e3f2..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_Close.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=757182
--->
-<head>
-  <title>Test for Bug 757182</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=757182">Mozilla Bug 757182</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_Close.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_DataURI.html b/dom/browser-element/mochitest/test_browserElement_oop_DataURI.html
deleted file mode 100644
index 113cbf2c217e..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_DataURI.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=720157
--->
-<head>
-  <title>Test for Bug 720157</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720157">Mozilla Bug 720157</a>
-
-<script type='application/javascript;version=1.7' src='browserElement_DataURI.js'></script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_GetScreenshot.html b/dom/browser-element/mochitest/test_browserElement_oop_GetScreenshot.html
deleted file mode 100644
index 3507b969bf53..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_GetScreenshot.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=753595
--->
-<head>
-  <title>Test for Bug 753595</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=753595">Mozilla Bug 753595</a>
-
-<script type="application/javascript;version=1.7" src='browserElement_GetScreenshot.js'>
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_Iconchange.html b/dom/browser-element/mochitest/test_browserElement_oop_Iconchange.html
deleted file mode 100644
index e43e942c29a2..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_Iconchange.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=719461
--->
-<head>
-  <title>Test for Bug 719461</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=719461">Mozilla Bug 719461</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_Iconchange.js">
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_KeyEvents.html b/dom/browser-element/mochitest/test_browserElement_oop_KeyEvents.html
deleted file mode 100644
index cafa45b3d296..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_KeyEvents.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=757486
--->
-<head>
-  <title>Test for Bug 757486</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=757486">Mozilla Bug 757486</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_KeyEvents.js">
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_LoadEvents.html b/dom/browser-element/mochitest/test_browserElement_oop_LoadEvents.html
deleted file mode 100644
index 522e520da417..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_LoadEvents.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=710231
--->
-<head>
-  <title>Test for Bug 710231</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=710231">Mozilla Bug 710231</a>
-
-<script type="application/javascript;version1.7" src="browserElement_LoadEvents.js"></script>
-
-</body>
-</html>
-
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_PromptCheck.html b/dom/browser-element/mochitest/test_browserElement_oop_PromptCheck.html
deleted file mode 100644
index c76852cb12c7..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_PromptCheck.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=741587
--->
-<head>
-  <title>Test for Bug 741587</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_PromptCheck.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_PromptConfirm.html b/dom/browser-element/mochitest/test_browserElement_oop_PromptConfirm.html
deleted file mode 100644
index 91a09c7644df..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_PromptConfirm.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=741587
--->
-<head>
-  <title>Test for Bug 741587</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_PromptConfirm.js">
-</script>
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_SetVisible.html b/dom/browser-element/mochitest/test_browserElement_oop_SetVisible.html
deleted file mode 100644
index 082361f40c6b..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_SetVisible.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=702880
--->
- <head>
-  <title>Test for Bug 702880</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=753595">Mozilla Bug 702880</a>
-
-<script type="application/javascript;version=1.7" src='browserElement_SetVisible.js'>
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_Titlechange.html b/dom/browser-element/mochitest/test_browserElement_oop_Titlechange.html
deleted file mode 100644
index a2b733c7ae0d..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_Titlechange.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=720157
--->
-<head>
-  <title>Test for Bug 720157</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720157">Mozilla Bug 720157</a>
-
-<script type="application/javascript;version=1.7" src='browserElement_Titlechange.js'>
-</script>
-
-</body>
-</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_TopBarrier.html b/dom/browser-element/mochitest/test_browserElement_oop_TopBarrier.html
deleted file mode 100644
index 262a950eb969..000000000000
--- a/dom/browser-element/mochitest/test_browserElement_oop_TopBarrier.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=725796
--->
-<head>
-  <title>Test for Bug 725796</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="browserFrameHelpers.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=725796">Mozilla Bug 725796</a>
-
-<script type="application/javascript;version=1.7" src="browserElement_TopBarrier.js">
-</script>
-
-</body>
-</html>
-
diff --git a/dom/browser-element/mochitest/browserElement_SetVisible.js b/dom/browser-element/mochitest/test_browserFrame10.html
similarity index 72%
rename from dom/browser-element/mochitest/browserElement_SetVisible.js
rename to dom/browser-element/mochitest/test_browserFrame10.html
index 8cfbcee35ed3..0d2284c4ae65 100644
--- a/dom/browser-element/mochitest/browserElement_SetVisible.js
+++ b/dom/browser-element/mochitest/test_browserFrame10.html
@@ -1,5 +1,22 @@
-// Test the setVisible property for mozbrowser
-"use strict";
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=702880
+-->
+ <head>
+  <title>Test for Bug 702880</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=753595">Mozilla Bug 702880</a>
+
+<!--
+   Test the setVisible property for mozbrowser
+-->
+
+<script type="application/javascript;version=1.7">
 
 SimpleTest.waitForExplicitFinish();
 
@@ -55,4 +72,7 @@ function runTest() {
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
+</script>
 
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_LoadEvents.js b/dom/browser-element/mochitest/test_browserFrame4.html
similarity index 80%
rename from dom/browser-element/mochitest/browserElement_LoadEvents.js
rename to dom/browser-element/mochitest/test_browserFrame4.html
index 4a9ca3a188df..6d1322f0a970 100644
--- a/dom/browser-element/mochitest/browserElement_LoadEvents.js
+++ b/dom/browser-element/mochitest/test_browserFrame4.html
@@ -1,7 +1,27 @@
-// Test that an iframe with the |mozbrowser| attribute emits mozbrowserloadX
-// events when this page is in the whitelist.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=710231
+-->
+<head>
+  <title>Test for Bug 710231</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=710231">Mozilla Bug 710231</a>
+
+<!--
+  Test that an iframe with the |mozbrowser| attribute emits
+  mozbrowserX events when this page is in the whitelist.
+-->
+
+<script type="application/javascript;version=1.7">
+
+// Bug 740626: This test fails on Windows XP
+if (navigator.userAgent.indexOf("Windows NT 5.1") == -1) {
 
-"use strict";
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
@@ -26,7 +46,6 @@ function runTest() {
     ok(e.isTrusted, 'Event should be trusted.');
     ok(!seenLoadEnd, 'loadstart before loadend.');
     ok(!seenLoadStart, 'Just one loadstart event.');
-    ok(!seenLocationChange, 'loadstart before locationchange.');
     seenLoadStart = true;
   }
 
@@ -113,3 +132,13 @@ function runTest2() {
 }
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
+
+}
+else {
+  ok(true, "Somebody thought it was a great idea to make me type this.");
+}
+
+</script>
+
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_DataURI.js b/dom/browser-element/mochitest/test_browserFrame5.html
similarity index 68%
rename from dom/browser-element/mochitest/browserElement_DataURI.js
rename to dom/browser-element/mochitest/test_browserFrame5.html
index 27f3e82d312d..a23f1f76c824 100644
--- a/dom/browser-element/mochitest/browserElement_DataURI.js
+++ b/dom/browser-element/mochitest/test_browserFrame5.html
@@ -1,6 +1,23 @@
-// Test that data: URIs work with mozbrowserlocationchange events.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=720157
+-->
+<head>
+  <title>Test for Bug 720157</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720157">Mozilla Bug 720157</a>
+
+<!--
+  Test that data: URIs work with mozbrowserlocationchange events.
+-->
+
+<script type="application/javascript;version=1.7">
 
-"use strict";
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
@@ -10,17 +27,13 @@ function runTest() {
   var iframe1 = document.createElement('iframe');
   iframe1.mozbrowser = true;
   iframe1.id = 'iframe1';
-  iframe1.addEventListener('mozbrowserloadend', function if1_loadend() {
-    iframe1.removeEventListener('mozbrowserloadend', if1_loadend);
+  iframe1.addEventListener('mozbrowserloadend', function() {
+    iframe1.removeEventListener('mozbrowserloadend', arguments.callee);
     ok(true, 'Got first loadend event.');
     SimpleTest.executeSoon(runTest2);
   });
   iframe1.src = browserFrameHelpers.emptyPage1;
   document.body.appendChild(iframe1);
-
-  var iframe2 = document.createElement('iframe');
-  iframe2.id = 'iframe2';
-  document.body.appendChild(iframe2);
 }
 
 function runTest2() {
@@ -64,3 +77,10 @@ function runTest2() {
 }
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
+
+</script>
+
+<iframe id='iframe2'></iframe>
+
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_Titlechange.js b/dom/browser-element/mochitest/test_browserFrame6.html
similarity index 78%
rename from dom/browser-element/mochitest/browserElement_Titlechange.js
rename to dom/browser-element/mochitest/test_browserFrame6.html
index 526e381fe8e4..a56476713f0a 100644
--- a/dom/browser-element/mochitest/browserElement_Titlechange.js
+++ b/dom/browser-element/mochitest/test_browserFrame6.html
@@ -1,4 +1,22 @@
-// Test that the onmozbrowsertitlechange event works.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=720157
+-->
+<head>
+  <title>Test for Bug 720157</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720157">Mozilla Bug 720157</a>
+
+<!--
+  Test that the onmozbrowsertitlechange event works.
+-->
+
+<script type="application/javascript;version=1.7">
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
@@ -65,4 +83,7 @@ function runTest() {
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
+</script>
 
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_TopBarrier.js b/dom/browser-element/mochitest/test_browserFrame7.html
similarity index 79%
rename from dom/browser-element/mochitest/browserElement_TopBarrier.js
rename to dom/browser-element/mochitest/test_browserFrame7.html
index 5f0103b3457a..e21b1f74c96b 100644
--- a/dom/browser-element/mochitest/browserElement_TopBarrier.js
+++ b/dom/browser-element/mochitest/test_browserFrame7.html
@@ -1,4 +1,22 @@
-// Test that an <iframe mozbrowser> is a window.{top,parent,frameElement} barrier.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=725796
+-->
+<head>
+  <title>Test for Bug 725796</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=725796">Mozilla Bug 725796</a>
+
+<!--
+  Test that an <iframe mozbrowser> is a window.{top,parent,frameElement} barrier.
+-->
+
+<script type="application/javascript;version=1.7">
 "use strict";
 
 browserFrameHelpers.setEnabledPref(true);
@@ -72,3 +90,7 @@ function waitForMessages(num) {
 }
 
 runTest();
+
+</script>
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_Iconchange.js b/dom/browser-element/mochitest/test_browserFrame8.html
similarity index 86%
rename from dom/browser-element/mochitest/browserElement_Iconchange.js
rename to dom/browser-element/mochitest/test_browserFrame8.html
index 30afd2cee365..894a615a2067 100644
--- a/dom/browser-element/mochitest/browserElement_Iconchange.js
+++ b/dom/browser-element/mochitest/test_browserFrame8.html
@@ -1,4 +1,23 @@
-// Test that the onmozbrowsericonchange event works.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=719461
+-->
+<head>
+  <title>Test for Bug 719461</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=719461">Mozilla Bug 719461</a>
+
+<!--
+  Test that the onmozbrowsericonchange event works.
+-->
+
+<script type="application/javascript;version=1.7">
+
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
@@ -104,3 +123,8 @@ function runTest() {
 }
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
+
+</script>
+
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_GetScreenshot.js b/dom/browser-element/mochitest/test_browserFrame9.html
similarity index 75%
rename from dom/browser-element/mochitest/browserElement_GetScreenshot.js
rename to dom/browser-element/mochitest/test_browserFrame9.html
index 3aee90fd7f5d..009f1cef77f7 100644
--- a/dom/browser-element/mochitest/browserElement_GetScreenshot.js
+++ b/dom/browser-element/mochitest/test_browserFrame9.html
@@ -1,4 +1,23 @@
-// Test the getScreenshot property for mozbrowser
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=753595
+-->
+<head>
+  <title>Test for Bug 753595</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=753595">Mozilla Bug 753595</a>
+
+<!--
+   Test the getScreenshot property for mozbrowser
+-->
+
+<script type="application/javascript;version=1.7">
+
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
@@ -70,4 +89,7 @@ function runTest() {
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
+</script>
 
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_Alert.js b/dom/browser-element/mochitest/test_browserFrameAlert.html
similarity index 87%
rename from dom/browser-element/mochitest/browserElement_Alert.js
rename to dom/browser-element/mochitest/test_browserFrameAlert.html
index 5f76e466cd31..91b82a62a8d5 100644
--- a/dom/browser-element/mochitest/browserElement_Alert.js
+++ b/dom/browser-element/mochitest/test_browserFrameAlert.html
@@ -1,4 +1,22 @@
-// Test that alert works.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=741587
+-->
+<head>
+  <title>Test for Bug 741587</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
+
+<!--
+  Test that alert works.
+-->
+
+<script type="application/javascript;version=1.7">
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
@@ -157,4 +175,6 @@ function waitForPendingTests(next) {
 }
 
 runTest();
-
+</script>
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/test_browserFrameClose.html b/dom/browser-element/mochitest/test_browserFrameClose.html
new file mode 100644
index 000000000000..1c43235487dd
--- /dev/null
+++ b/dom/browser-element/mochitest/test_browserFrameClose.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=757182
+-->
+<head>
+  <title>Test for Bug 757182</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=757182">Mozilla Bug 757182</a>
+
+<!--
+  Test that window.close() works.
+-->
+
+<script type="application/javascript;version=1.7">
+"use strict";
+
+SimpleTest.waitForExplicitFinish();
+
+function runTest() {
+  browserFrameHelpers.setEnabledPref(true);
+  browserFrameHelpers.addToWhitelist();
+
+  var iframe = document.createElement('iframe');
+  iframe.mozbrowser = true;
+  document.body.appendChild(iframe);
+
+  iframe.addEventListener("mozbrowserclose", function(e) {
+    ok(true, "got mozbrowserclose event.");
+    SimpleTest.finish();
+  });
+
+  iframe.src = "data:text/html,<html><body><script>window.close()</scr"+"ipt></body></html>";
+}
+
+runTest();
+</script>
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_PromptCheck.js b/dom/browser-element/mochitest/test_browserFramePromptCheck.html
similarity index 62%
rename from dom/browser-element/mochitest/browserElement_PromptCheck.js
rename to dom/browser-element/mochitest/test_browserFramePromptCheck.html
index 83b9b7218d2b..79b980aaf116 100644
--- a/dom/browser-element/mochitest/browserElement_PromptCheck.js
+++ b/dom/browser-element/mochitest/test_browserFramePromptCheck.html
@@ -1,9 +1,27 @@
-// Test that alertCheck (i.e., alert with the opportunity to opt out of future
-// alerts), promptCheck, and confirmCheck work.  We do this by spamming
-// alerts/prompts/confirms from inside an <iframe mozbrowser>.
-//
-// At the moment, we treat alertCheck/promptCheck/confirmCheck just like a
-// normal alert.  But it's different to nsIPrompt!
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=741587
+-->
+<head>
+  <title>Test for Bug 741587</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
+
+<!--
+  Test that alertCheck (i.e., alert with the opportunity to opt out of future
+  alerts), promptCheck, and confirmCheck work.  We do this by spamming
+  alerts/prompts/confirms from inside an <iframe mozbrowser>.
+
+  At the moment, we treat alertCheck/promptCheck/confirmCheck just like a
+  normal alert.  But it's different to nsIPrompt!
+-->
+
+<script type="application/javascript;version=1.7">
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
@@ -59,3 +77,7 @@ iframe.src =
     for (; i < 20; i++) { confirm(i); } \
     for (; i < 30; i++) { prompt(i); } \
    </scr' + 'ipt></body></html>';
+
+</script>
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_PromptConfirm.js b/dom/browser-element/mochitest/test_browserFramePromptConfirm.html
similarity index 75%
rename from dom/browser-element/mochitest/browserElement_PromptConfirm.js
rename to dom/browser-element/mochitest/test_browserFramePromptConfirm.html
index 266f5735cb74..4eba39ca64d3 100644
--- a/dom/browser-element/mochitest/browserElement_PromptConfirm.js
+++ b/dom/browser-element/mochitest/test_browserFramePromptConfirm.html
@@ -1,8 +1,26 @@
-// Test that prompt and confirm work.  In particular, we're concerned that we
-// get correct return values out of them.
-//
-// We use alert() to communicate the return values of prompt/confirm back to
-// ourselves.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=741587
+-->
+<head>
+  <title>Test for Bug 741587</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741587">Mozilla Bug 741587</a>
+
+<!--
+  Test that prompt and confirm work.  In particular, we're concerned that we
+  get correct return values out of them.
+
+  We use alert() to communicate the return values of prompt/confirm back to
+  ourselves.
+-->
+
+<script type="application/javascript;version=1.7">
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
@@ -83,3 +101,6 @@ function runTest() {
 }
 
 runTest();
+</script>
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/browserElement_KeyEvents.js b/dom/browser-element/mochitest/test_browserFrame_keyEvents.html
similarity index 74%
rename from dom/browser-element/mochitest/browserElement_KeyEvents.js
rename to dom/browser-element/mochitest/test_browserFrame_keyEvents.html
index 9c8e165fca21..d04497bf0edd 100644
--- a/dom/browser-element/mochitest/browserElement_KeyEvents.js
+++ b/dom/browser-element/mochitest/test_browserFrame_keyEvents.html
@@ -1,5 +1,24 @@
-// Test that an iframe with the |mozbrowser| attribute does bubble some
-// whitelisted key events.
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=757486
+-->
+<head>
+  <title>Test for Bug 757486</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript" src="browserFrameHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=757486">Mozilla Bug 757486</a>
+
+<!--
+  Test that an iframe with the |mozbrowser| attribute does bubble some
+  whitelisted key events.
+-->
+
+<script type="application/javascript;version=1.7">
 "use strict";
 
 let Ci = Components.interfaces;
@@ -74,3 +93,7 @@ SimpleTest.waitForFocus(function() {
   SimpleTest.executeSoon(runTest);
 });
 
+</script>
+
+</body>
+</html>