From 244ab09ed656f1378265f3f1673339c339d3006a Mon Sep 17 00:00:00 2001 From: Matt Wobensmith Date: Wed, 10 Feb 2016 14:44:15 -0800 Subject: [PATCH] Bug 1246227 - Remove SEC_NORMAL from dom/base/test (r=ckerschb) --- dom/base/test/test_bug422403-1.html | 4 ++-- dom/base/test/test_bug422403-2.xhtml | 4 ++-- dom/base/test/test_bug424359-1.html | 4 ++-- dom/base/test/test_bug424359-2.html | 4 ++-- dom/base/test/test_bug498433.html | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dom/base/test/test_bug422403-1.html b/dom/base/test/test_bug422403-1.html index b1c9a1aa810..38d238fd49b 100644 --- a/dom/base/test/test_bug422403-1.html +++ b/dom/base/test/test_bug422403-1.html @@ -35,14 +35,14 @@ function loadFileContent(aFile, aCharset) { null, // aLoadingNode SpecialPowers.Services.scriptSecurityManager.getSystemPrincipal(), null, // aTriggeringPrincipal - SpecialPowers.Ci.nsILoadInfo.SEC_NORMAL, + SpecialPowers.Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, SpecialPowers.Ci.nsIContentPolicy.TYPE_OTHER); var cis = SpecialPowers.Ci.nsIConverterInputStream; var inputStream = SpecialPowers.Cc["@mozilla.org/intl/converter-input-stream;1"] .createInstance(cis); - inputStream.init(chann.open(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); + inputStream.init(chann.open2(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); var str = {}, content = ''; while (inputStream.readString(4096, str) != 0) { content += str.value; diff --git a/dom/base/test/test_bug422403-2.xhtml b/dom/base/test/test_bug422403-2.xhtml index 460558aac02..c49b4d10a5b 100644 --- a/dom/base/test/test_bug422403-2.xhtml +++ b/dom/base/test/test_bug422403-2.xhtml @@ -35,14 +35,14 @@ function loadFileContent(aFile, aCharset) { null, // aLoadingNode SpecialPowers.Services.scriptSecurityManager.getSystemPrincipal(), null, // aTriggeringPrincipal - SpecialPowers.Ci.nsILoadInfo.SEC_NORMAL, + SpecialPowers.Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, SpecialPowers.Ci.nsIContentPolicy.TYPE_OTHER); var cis = SpecialPowers.Ci.nsIConverterInputStream; var inputStream = SpecialPowers.Cc["@mozilla.org/intl/converter-input-stream;1"] .createInstance(cis); - inputStream.init(chann.open(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); + inputStream.init(chann.open2(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); var str = {}, content = ''; while (inputStream.readString(4096, str) != 0) { content += str.value; diff --git a/dom/base/test/test_bug424359-1.html b/dom/base/test/test_bug424359-1.html index 339042bba8a..a7aa90c15e6 100644 --- a/dom/base/test/test_bug424359-1.html +++ b/dom/base/test/test_bug424359-1.html @@ -35,14 +35,14 @@ function loadFileContent(aFile, aCharset) { null, // aLoadingNode SpecialPowers.Services.scriptSecurityManager.getSystemPrincipal(), null, // aTriggeringPrincipal - SpecialPowers.Ci.nsILoadInfo.SEC_NORMAL, + SpecialPowers.Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, SpecialPowers.Ci.nsIContentPolicy.TYPE_OTHER); var cis = SpecialPowers.Ci.nsIConverterInputStream; var inputStream = SpecialPowers.Cc["@mozilla.org/intl/converter-input-stream;1"] .createInstance(cis); - inputStream.init(chann.open(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); + inputStream.init(chann.open2(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); var str = {}, content = ''; while (inputStream.readString(4096, str) != 0) { content += str.value; diff --git a/dom/base/test/test_bug424359-2.html b/dom/base/test/test_bug424359-2.html index 4bb082620ea..b3bded1bba5 100644 --- a/dom/base/test/test_bug424359-2.html +++ b/dom/base/test/test_bug424359-2.html @@ -35,14 +35,14 @@ function loadFileContent(aFile, aCharset) { null, // aLoadingNode SpecialPowers.Services.scriptSecurityManager.getSystemPrincipal(), null, // aTriggeringPrincipal - SpecialPowers.Ci.nsILoadInfo.SEC_NORMAL, + SpecialPowers.Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, SpecialPowers.Ci.nsIContentPolicy.TYPE_OTHER); var cis = SpecialPowers.Ci.nsIConverterInputStream; var inputStream = SpecialPowers.Cc["@mozilla.org/intl/converter-input-stream;1"] .createInstance(cis); - inputStream.init(chann.open(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); + inputStream.init(chann.open2(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); var str = {}, content = ''; while (inputStream.readString(4096, str) != 0) { content += str.value; diff --git a/dom/base/test/test_bug498433.html b/dom/base/test/test_bug498433.html index 2b3ba610b33..5bafcd2ea61 100644 --- a/dom/base/test/test_bug498433.html +++ b/dom/base/test/test_bug498433.html @@ -34,14 +34,14 @@ function loadFileContent(aFile, aCharset) { null, // aLoadingNode SpecialPowers.Services.scriptSecurityManager.getSystemPrincipal(), null, // aTriggeringPrincipal - SpecialPowers.Ci.nsILoadInfo.SEC_NORMAL, + SpecialPowers.Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, SpecialPowers.Ci.nsIContentPolicy.TYPE_OTHER); var cis = SpecialPowers.Ci.nsIConverterInputStream; var inputStream = SpecialPowers.Cc["@mozilla.org/intl/converter-input-stream;1"] .createInstance(cis); - inputStream.init(chann.open(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); + inputStream.init(chann.open2(), aCharset, 1024, cis.DEFAULT_REPLACEMENT_CHARACTER); var str = {}, content = ''; while (inputStream.readString(4096, str) != 0) { content += str.value;