Bug 762049 - Part 3: Rename browserFrameHelpers to browserElementTestHelpers. r=mounir

--HG--
rename : dom/browser-element/mochitest/browserFrameHelpers.js => dom/browser-element/mochitest/browserElementTestHelpers.js
rename : dom/browser-element/mochitest/test_browserFrameAlert.html => dom/browser-element/mochitest/browserElement_Alert.js
rename : dom/browser-element/mochitest/test_browserFrame5.html => dom/browser-element/mochitest/browserElement_DataURI.js
rename : dom/browser-element/mochitest/test_browserFrame9.html => dom/browser-element/mochitest/browserElement_GetScreenshot.js
rename : dom/browser-element/mochitest/test_browserFrame8.html => dom/browser-element/mochitest/browserElement_Iconchange.js
rename : dom/browser-element/mochitest/test_browserFrame_keyEvents.html => dom/browser-element/mochitest/browserElement_KeyEvents.js
rename : dom/browser-element/mochitest/test_browserFrame4.html => dom/browser-element/mochitest/browserElement_LoadEvents.js
rename : dom/browser-element/mochitest/test_browserFramePromptCheck.html => dom/browser-element/mochitest/browserElement_PromptCheck.js
rename : dom/browser-element/mochitest/test_browserFramePromptConfirm.html => dom/browser-element/mochitest/browserElement_PromptConfirm.js
rename : dom/browser-element/mochitest/test_browserFrame10.html => dom/browser-element/mochitest/browserElement_SetVisible.js
rename : dom/browser-element/mochitest/test_browserFrame6.html => dom/browser-element/mochitest/browserElement_Titlechange.js
rename : dom/browser-element/mochitest/test_browserFrame7.html => dom/browser-element/mochitest/browserElement_TopBarrier.js
rename : dom/browser-element/mochitest/test_browserFrame1.html => dom/browser-element/mochitest/test_browserElement_NoAttr.html
rename : dom/browser-element/mochitest/test_browserFrame2.html => dom/browser-element/mochitest/test_browserElement_NoPref.html
rename : dom/browser-element/mochitest/test_browserFrame3.html => dom/browser-element/mochitest/test_browserElement_NoWhitelist.html
extra : rebase_source : 5fe45225fa772c9bf2a6a2b3f9fcd85bf3e555d7

dom/browser-element/mochitest/Makefile.in

@@ -12,14 +12,14 @@ 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
+# Note: browserElementTestHelpers.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 \
-		browserFrameHelpers.js \
+		browserElementTestHelpers.js \
 		test_browserElement_NoAttr.html \
 		test_browserElement_NoPref.html \
 		test_browserElement_NoWhitelist.html \

dom/browser-element/mochitest/browserElementTestHelpers.js

@@ -2,7 +2,7 @@
 
 // Helpers for managing the browser frame preferences.
 
-const browserFrameHelpers = {
+const browserElementTestHelpers = {
   _getBoolPref: function(pref) {
     try {
       return SpecialPowers.getBoolPref(pref);
@@ -111,14 +111,14 @@ const browserFrameHelpers = {
                 '/file_focus.html',
 };
 
-browserFrameHelpers.origEnabledPref = browserFrameHelpers.getEnabledPref();
-browserFrameHelpers.origWhitelistPref = browserFrameHelpers.getWhitelistPref();
-browserFrameHelpers.origOOPDisabledPref = browserFrameHelpers.getOOPDisabledPref();
-browserFrameHelpers.origOOPByDefaultPref = browserFrameHelpers.getOOPByDefaultPref();
-browserFrameHelpers.origPageThumbsEnabledPref = browserFrameHelpers.getPageThumbsEnabledPref();
+browserElementTestHelpers.origEnabledPref = browserElementTestHelpers.getEnabledPref();
+browserElementTestHelpers.origWhitelistPref = browserElementTestHelpers.getWhitelistPref();
+browserElementTestHelpers.origOOPDisabledPref = browserElementTestHelpers.getOOPDisabledPref();
+browserElementTestHelpers.origOOPByDefaultPref = browserElementTestHelpers.getOOPByDefaultPref();
+browserElementTestHelpers.origPageThumbsEnabledPref = browserElementTestHelpers.getPageThumbsEnabledPref();
 
 // Disable tab view; it seriously messes us up.
-browserFrameHelpers.setPageThumbsEnabledPref(false);
+browserElementTestHelpers.setPageThumbsEnabledPref(false);
 
 // Enable or disable OOP depending on the test's filename.
 var oop;
@@ -130,9 +130,9 @@ else {
   oop = true;
 }
 
-browserFrameHelpers.setOOPByDefaultPref(oop);
-browserFrameHelpers.setOOPDisabledPref(false);
+browserElementTestHelpers.setOOPByDefaultPref(oop);
+browserElementTestHelpers.setOOPDisabledPref(false);
 
 addEventListener('unload', function() {
-  browserFrameHelpers.restoreOriginalPrefs();
+  browserElementTestHelpers.restoreOriginalPrefs();
 });

dom/browser-element/mochitest/browserElement_Alert.js

@@ -8,8 +8,8 @@ var iframe;
 var mm;
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   iframe = document.createElement('iframe');
   iframe.mozbrowser = true;
@@ -29,7 +29,7 @@ function runTest() {
   // for that load to finish, then start test1.
   iframe.addEventListener('mozbrowserloadend', function loadend() {
     iframe.removeEventListener('mozbrowserloadend', loadend);
-    iframe.src = browserFrameHelpers.emptyPage1;
+    iframe.src = browserElementTestHelpers.emptyPage1;
 
     iframe.addEventListener('mozbrowserloadend', function loadend2() {
       iframe.removeEventListener('mozbrowserloadend', loadend2);
@@ -132,7 +132,7 @@ function test5(e) {
 
 function test5a() {
   iframe.addEventListener('mozbrowserloadend', test5b);
-  iframe.src = browserFrameHelpers.emptyPage2;
+  iframe.src = browserElementTestHelpers.emptyPage2;
 }
 
 function test5b() {

dom/browser-element/mochitest/browserElement_Close.js

@@ -4,8 +4,8 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   var iframe = document.createElement('iframe');
   iframe.mozbrowser = true;

dom/browser-element/mochitest/browserElement_DataURI.js

@@ -4,8 +4,8 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   var iframe1 = document.createElement('iframe');
   iframe1.mozbrowser = true;
@@ -15,7 +15,7 @@ function runTest() {
     ok(true, 'Got first loadend event.');
     SimpleTest.executeSoon(runTest2);
   });
-  iframe1.src = browserFrameHelpers.emptyPage1;
+  iframe1.src = browserElementTestHelpers.emptyPage1;
   document.body.appendChild(iframe1);
 
   var iframe2 = document.createElement('iframe');
@@ -60,7 +60,7 @@ function runTest2() {
 
   // Load something into iframe2 to check that it doesn't trigger a
   // locationchange for our iframe1 listener.
-  iframe2.src = browserFrameHelpers.emptyPage2;
+  iframe2.src = browserElementTestHelpers.emptyPage2;
 }
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });

dom/browser-element/mochitest/browserElement_GetScreenshot.js

@@ -5,8 +5,8 @@ SimpleTest.waitForExplicitFinish();
 
 function runTest() {
 
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   var iframe1 = document.createElement('iframe');
   iframe1.mozbrowser = true;

dom/browser-element/mochitest/browserElement_Iconchange.js

@@ -12,8 +12,8 @@ function createLink(name) {
 }
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   var iframe1 = document.createElement('iframe');
   iframe1.mozbrowser = true;

dom/browser-element/mochitest/browserElement_KeyEvents.js

@@ -14,13 +14,13 @@ let whitelistedEvents = [
 
 SimpleTest.waitForExplicitFinish();
 
-browserFrameHelpers.setEnabledPref(true);
-browserFrameHelpers.addToWhitelist();
-browserFrameHelpers.setOOPDisabledPref(true); // this is breaking the autofocus.
+browserElementTestHelpers.setEnabledPref(true);
+browserElementTestHelpers.addToWhitelist();
+browserElementTestHelpers.setOOPDisabledPref(true); // this is breaking the autofocus.
 
 var iframe = document.createElement('iframe');
 iframe.mozbrowser = true;
-iframe.src = browserFrameHelpers.focusPage;
+iframe.src = browserElementTestHelpers.focusPage;
 document.body.appendChild(iframe);
 
 // Number of expected events at which point we will consider the test as done.
@@ -35,7 +35,7 @@ function eventHandler(e) {
   nbEvents--;
 
   if (nbEvents == 0) {
-    browserFrameHelpers.restoreOriginalPrefs();
+    browserElementTestHelpers.restoreOriginalPrefs();
     SimpleTest.finish();
     return;
   }

dom/browser-element/mochitest/browserElement_LoadEvents.js

@@ -5,8 +5,8 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   // Load emptypage1 into the iframe, wait for that to finish loading, then
   // call runTest2.
@@ -20,7 +20,7 @@ function runTest() {
   var iframe = document.createElement('iframe');
   iframe.mozbrowser = true;
   iframe.id = 'iframe';
-  iframe.src = browserFrameHelpers.emptyPage1;
+  iframe.src = browserElementTestHelpers.emptyPage1;
 
   function loadstart(e) {
     ok(e.isTrusted, 'Event should be trusted.');
@@ -36,7 +36,7 @@ function runTest() {
     seenLocationChange = true;
     ok(seenLoadStart, 'Location change after load start.');
     ok(!seenLoadEnd, 'Location change before load end.');
-    ok(e.detail, browserFrameHelpers.emptyPage1, "event's reported location");
+    ok(e.detail, browserElementTestHelpers.emptyPage1, "event's reported location");
   }
 
   function loadend(e) {
@@ -87,7 +87,7 @@ function runTest2() {
     seenLocationChange = true;
     ok(seenLoadStart, 'Location change after load start.');
     ok(!seenLoadEnd, 'Location change before load end.');
-    ok(e.detail, browserFrameHelpers.emptyPage2, "event's reported location");
+    ok(e.detail, browserElementTestHelpers.emptyPage2, "event's reported location");
   });
 
   iframe.addEventListener('mozbrowserloadend', function(e) {
@@ -98,7 +98,7 @@ function runTest2() {
     ok(seenLocationChange, 'Load end after location change.');
   });
 
-  iframe.src = browserFrameHelpers.emptyPage2;
+  iframe.src = browserElementTestHelpers.emptyPage2;
 
   function waitForAllCallbacks() {
     if (!seenLoadStart || !seenLoadEnd || !seenLocationChange) {

dom/browser-element/mochitest/browserElement_PromptCheck.js

@@ -8,8 +8,8 @@
 
 SimpleTest.waitForExplicitFinish();
 
-browserFrameHelpers.setEnabledPref(true);
-browserFrameHelpers.addToWhitelist();
+browserElementTestHelpers.setEnabledPref(true);
+browserElementTestHelpers.addToWhitelist();
 
 // Test harness sets dom.successive_dialog_time_limit to 0 for some bizarre
 // reason.  That's not normal usage, and it keeps us from testing alertCheck!

dom/browser-element/mochitest/browserElement_PromptConfirm.js

@@ -8,8 +8,8 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   var iframe = document.createElement('iframe');
   iframe.mozbrowser = true;

dom/browser-element/mochitest/browserElement_SetVisible.js

@@ -13,8 +13,8 @@ var iframeScript = function() {
 
 function runTest() {
 
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   var mm;
   var numEvents = 0;

dom/browser-element/mochitest/browserElement_Titlechange.js

@@ -4,8 +4,8 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.addToWhitelist();
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
 
   var iframe1 = document.createElement('iframe');
   iframe1.mozbrowser = true;

dom/browser-element/mochitest/browserElement_TopBarrier.js

@@ -1,8 +1,8 @@
 // Test that an <iframe mozbrowser> is a window.{top,parent,frameElement} barrier.
 "use strict";
 
-browserFrameHelpers.setEnabledPref(true);
-browserFrameHelpers.addToWhitelist();
+browserElementTestHelpers.setEnabledPref(true);
+browserElementTestHelpers.addToWhitelist();
 
 var iframe;
 function runTest() {

dom/browser-element/mochitest/test_browserElement_NoAttr.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
@@ -33,7 +33,7 @@ function runTest() {
     SimpleTest.finish();
   });
 
-  iframe.src = browserFrameHelpers.emptyPage1;
+  iframe.src = browserElementTestHelpers.emptyPage1;
 }
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });

dom/browser-element/mochitest/test_browserElement_NoPref.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
@@ -23,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=710231
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(false);
+  browserElementTestHelpers.setEnabledPref(false);
 
   var iframe = document.createElement('iframe');
   iframe.mozbrowser = true;
@@ -38,7 +38,7 @@ function runTest() {
     SimpleTest.finish();
   });
 
-  iframe.src = browserFrameHelpers.emptyPage1;
+  iframe.src = browserElementTestHelpers.emptyPage1;
 }
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });

dom/browser-element/mochitest/test_browserElement_NoWhitelist.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
@@ -23,8 +23,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=710231
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  browserFrameHelpers.setEnabledPref(true);
-  browserFrameHelpers.setWhitelistPref(' http://foobar.com');
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.setWhitelistPref(' http://foobar.com');
 
   var iframe = document.createElement('iframe');
   iframe.mozbrowser = true;
@@ -39,7 +39,7 @@ function runTest() {
     SimpleTest.finish();
   });
 
-  iframe.src = browserFrameHelpers.emptyPage1;
+  iframe.src = browserElementTestHelpers.emptyPage1;
 }
 
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });

dom/browser-element/mochitest/test_browserElement_inproc_Alert.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_Close.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_DataURI.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_Iconchange.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_KeyEvents.html

@@ -7,7 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=757486
   <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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_LoadEvents.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_PromptCheck.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_PromptConfirm.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_SetVisible.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_Titlechange.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_inproc_TopBarrier.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_Alert.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_Close.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_DataURI.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_GetScreenshot.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_Iconchange.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_KeyEvents.html

@@ -7,7 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=757486
   <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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_LoadEvents.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_PromptCheck.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_PromptConfirm.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_SetVisible.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_Titlechange.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>

dom/browser-element/mochitest/test_browserElement_oop_TopBarrier.html

@@ -6,7 +6,7 @@ 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>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>