No bug - Update tests for bug 756645 to use permissions instead of whitelist in prefs. r=bent

--HG--
extra : rebase_source : f05215f2c72538a3b5bb4382710c1fa5f9cc1759
This commit is contained in:
Mounir Lamouri 2012-08-28 14:05:33 -03:00
parent a6c49999cf
commit 816d52b077

View File

@ -6,7 +6,6 @@ var fileTestOnCurrentOrigin = (location.protocol + '//' + location.host + locati
var previousPrefs = {
mozBrowserFramesEnabled: undefined,
mozBrowserFramesWhitelist: undefined,
oop_by_default: undefined,
};
@ -16,20 +15,16 @@ try {
{
}
try {
previousPrefs.mozBrowserFramesWhitelist = SpecialPowers.getCharPref('dom.mozBrowserFramesWhitelist');
} catch(e) {
}
try {
previousPrefs.oop_by_default = SpecialPowers.getBoolPref('dom.ipc.browser_frames.oop_by_default');
} catch(e) {
}
SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
SpecialPowers.setCharPref('dom.mozBrowserFramesWhitelist', location.protocol + "//" + location.host);
SpecialPowers.setBoolPref("dom.ipc.browser_frames.oop_by_default", location.pathname.indexOf('_inproc') == -1);
SpecialPowers.addPermission("browser", true, window.document);
var gData = [
// APP 1
{
@ -104,13 +99,12 @@ function runTest() {
if (previousPrefs.mozBrowserFramesEnabled !== undefined) {
SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', previousPrefs.mozBrowserFramesEnabled);
}
if (previousPrefs.mozBrowserFramesWhitelist !== undefined) {
SpecialPowers.setCharPref('dom.mozBrowserFramesWhitelist', previousPrefs.mozBrowserFramesWhitelist);
}
if (previousPrefs.oop_by_default !== undefined) {
SpecialPowers.setBoolPref("dom.ipc.browser_frames.oop_by_default", previousPrefs.oop_by_default);
}
SpecialPowers.removePermission("browser", window.document);
indexedDB.deleteDatabase('AppIsolationTest').onsuccess = function() {
SimpleTest.finish();
};