diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in index 835aa1674751..981e428f1057 100644 --- a/dom/browser-element/mochitest/Makefile.in +++ b/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 \ diff --git a/dom/browser-element/mochitest/browserFrameHelpers.js b/dom/browser-element/mochitest/browserElementTestHelpers.js similarity index 81% rename from dom/browser-element/mochitest/browserFrameHelpers.js rename to dom/browser-element/mochitest/browserElementTestHelpers.js index 062cd7a6c017..e184e79a1f46 100644 --- a/dom/browser-element/mochitest/browserFrameHelpers.js +++ b/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(); }); diff --git a/dom/browser-element/mochitest/browserElement_Alert.js b/dom/browser-element/mochitest/browserElement_Alert.js index 5f76e466cd31..c9a692747e16 100644 --- a/dom/browser-element/mochitest/browserElement_Alert.js +++ b/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() { diff --git a/dom/browser-element/mochitest/browserElement_Close.js b/dom/browser-element/mochitest/browserElement_Close.js index f26834817589..b1f6cd004ae4 100644 --- a/dom/browser-element/mochitest/browserElement_Close.js +++ b/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; diff --git a/dom/browser-element/mochitest/browserElement_DataURI.js b/dom/browser-element/mochitest/browserElement_DataURI.js index 27f3e82d312d..7c49960145d7 100644 --- a/dom/browser-element/mochitest/browserElement_DataURI.js +++ b/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); }); diff --git a/dom/browser-element/mochitest/browserElement_GetScreenshot.js b/dom/browser-element/mochitest/browserElement_GetScreenshot.js index 3aee90fd7f5d..a5d2eb636e3e 100644 --- a/dom/browser-element/mochitest/browserElement_GetScreenshot.js +++ b/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; diff --git a/dom/browser-element/mochitest/browserElement_Iconchange.js b/dom/browser-element/mochitest/browserElement_Iconchange.js index 30afd2cee365..84ce570e2fb6 100644 --- a/dom/browser-element/mochitest/browserElement_Iconchange.js +++ b/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; diff --git a/dom/browser-element/mochitest/browserElement_KeyEvents.js b/dom/browser-element/mochitest/browserElement_KeyEvents.js index 9c8e165fca21..dce1438fe2e8 100644 --- a/dom/browser-element/mochitest/browserElement_KeyEvents.js +++ b/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; } diff --git a/dom/browser-element/mochitest/browserElement_LoadEvents.js b/dom/browser-element/mochitest/browserElement_LoadEvents.js index 4a9ca3a188df..f39ba2a59d9b 100644 --- a/dom/browser-element/mochitest/browserElement_LoadEvents.js +++ b/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) { diff --git a/dom/browser-element/mochitest/browserElement_PromptCheck.js b/dom/browser-element/mochitest/browserElement_PromptCheck.js index 83b9b7218d2b..621e26fbd3a9 100644 --- a/dom/browser-element/mochitest/browserElement_PromptCheck.js +++ b/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! diff --git a/dom/browser-element/mochitest/browserElement_PromptConfirm.js b/dom/browser-element/mochitest/browserElement_PromptConfirm.js index 266f5735cb74..3ed7966aa286 100644 --- a/dom/browser-element/mochitest/browserElement_PromptConfirm.js +++ b/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; diff --git a/dom/browser-element/mochitest/browserElement_SetVisible.js b/dom/browser-element/mochitest/browserElement_SetVisible.js index 8cfbcee35ed3..ba2357f23d4c 100644 --- a/dom/browser-element/mochitest/browserElement_SetVisible.js +++ b/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; diff --git a/dom/browser-element/mochitest/browserElement_Titlechange.js b/dom/browser-element/mochitest/browserElement_Titlechange.js index 526e381fe8e4..d773d996f825 100644 --- a/dom/browser-element/mochitest/browserElement_Titlechange.js +++ b/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; diff --git a/dom/browser-element/mochitest/browserElement_TopBarrier.js b/dom/browser-element/mochitest/browserElement_TopBarrier.js index 5f0103b3457a..7bc0e507af2f 100644 --- a/dom/browser-element/mochitest/browserElement_TopBarrier.js +++ b/dom/browser-element/mochitest/browserElement_TopBarrier.js @@ -1,8 +1,8 @@ // Test that an