wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1167053 - Convert NetUtil.newChannel2 callsites to use new API - update newChannel2 (r=sicking,paolo)

Browse Source
This commit is contained in:
Christoph Kerschbaumer 2015-05-21 19:52:03 -07:00
parent 6c7838c166
commit b9e76daa73
31 changed files with 108 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addon-sdk/source/lib/sdk/net/url.js
View File

@ -35,14 +35,9 @@ function readURI(uri, options) {
options = options || {};
let charset = options.charset || 'UTF-8';
let channel = NetUtil.newChannel2(uri,
charset,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(uri, charset),
loadUsingSystemPrincipal: true});
let { promise, resolve, reject } = defer();
@ -83,14 +78,9 @@ exports.readURI = readURI;
function readURISync(uri, charset) {
charset = typeof charset === "string" ? charset : "UTF-8";
let channel = NetUtil.newChannel2(uri,
charset,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(uri, charset),
loadUsingSystemPrincipal: true});
let stream = channel.open();
let count = stream.available();

12
addon-sdk/source/lib/toolkit/loader.js
View File

@ -178,14 +178,10 @@ function readURI(uri) {
uri = proto.resolveURI(nsURI);
}
let stream = NetUtil.newChannel2(uri,
'UTF-8',
null,
null, // aLoadingNode
systemPrincipal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER).open();
let stream = NetUtil.newChannel({
uri: NetUtil.newURI(uri, 'UTF-8'),
loadUsingSystemPrincipal: true}
).open();
let count = stream.available();
let data = NetUtil.readInputStreamToString(stream, count, {
charset: 'UTF-8'

9
browser/base/content/test/general/browser_blob-channelname.js
View File

@ -5,14 +5,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
function test() {
var file = new File([new Blob(['test'], {type: 'text/plain'})], "test-name");
var url = URL.createObjectURL(file);
var channel = NetUtil.newChannel2(url,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var channel = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
is(channel.contentDispositionFilename, 'test-name', "filename matches");
}

12
browser/devtools/canvasdebugger/snapshotslist.js
View File

@ -359,14 +359,10 @@ let SnapshotsListView = Heritage.extend(WidgetMethods, {
return;
}
let channel = NetUtil.newChannel2(fp.file,
null,
null,
window.document,
null, // aLoadingPrincipal
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(fp.file),
loadingNode: window.document,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
channel.contentType = "text/plain";
NetUtil.asyncFetch(channel, (inputStream, status) => {

11
browser/devtools/performance/modules/io.js
View File

@ -76,14 +76,9 @@ let PerformanceIO = {
loadRecordingFromFile: function(file) {
let deferred = promise.defer();
let channel = NetUtil.newChannel2(file,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(file),
loadUsingSystemPrincipal: true});
channel.contentType = "text/plain";

12
browser/devtools/profiler/ui-recordings.js
View File

@ -326,14 +326,10 @@ function saveRecordingToFile(recordingItem, file) {
function loadRecordingFromFile(file) {
let deferred = promise.defer();
let channel = NetUtil.newChannel2(file,
null,
null,
window.document,
null, // aLoadingPrincipal
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(file),
loadingNode: window.document,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
channel.contentType = "text/plain";
NetUtil.asyncFetch(channel, (inputStream, status) => {

12
browser/devtools/scratchpad/scratchpad.js
View File

@ -1154,14 +1154,10 @@ var Scratchpad = {
importFromFile: function SP_importFromFile(aFile, aSilentError, aCallback)
{
// Prevent file type detection.
let channel = NetUtil.newChannel2(aFile,
null,
null,
window.document,
null, // aLoadingPrincipal
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(aFile),
loadingNode: window.document,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
channel.contentType = "application/javascript";
this.notificationBox.removeAllNotifications(false);

11
browser/devtools/scratchpad/test/browser_scratchpad_confirm_close.js
View File

@ -214,14 +214,9 @@ function writeFile(file, content, callback)
function readFile(file, callback)
{
let channel = NetUtil.newChannel2(file,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(file),
loadUsingSystemPrincipal: true});
channel.contentType = "application/javascript";
NetUtil.asyncFetch(channel, function(inputStream, status) {

11
browser/devtools/scratchpad/test/browser_scratchpad_files.js
View File

@ -91,14 +91,9 @@ function fileExported(aStatus)
gFileContent = oldContent;
let channel = NetUtil.newChannel2(gFile,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(gFile),
loadUsingSystemPrincipal: true});
channel.contentType = "application/javascript";
// Read back the temporary file.

12
browser/devtools/shared/theme.js
View File

@ -25,14 +25,10 @@ const cachedThemes = {};
* Returns a string of the file found at URI
*/
function readURI (uri) {
let stream = NetUtil.newChannel2(uri,
"UTF-8",
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER).open();
let stream = NetUtil.newChannel({
uri: NetUtil.newURI(uri, "UTF-8"),
loadUsingSystemPrincipal: true}
).open();
let count = stream.available();
let data = NetUtil.readInputStreamToString(stream, count, { charset: "UTF-8" });

13
browser/extensions/pdfjs/content/PdfStreamConverter.jsm
View File

@ -157,14 +157,11 @@ function makeContentReadable(obj, window) {
}
function createNewChannel(uri, node, principal) {
return NetUtil.newChannel2(uri,
null,
null,
node, // aLoadingNode
principal, // aLoadingPrincipal
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
return NetUtil.newChannel({
uri: uri,
loadingNode: node,
loadingPrincipal: principal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
}
function asyncFetchChannel(channel, callback) {

12
dom/apps/AppsUtils.jsm
View File

@ -696,14 +696,10 @@ this.AppsUtils = {
let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
file.initWithPath(aPath);
let channel = NetUtil.newChannel2(file,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(file),
loadUsingSystemPrincipal: true});
channel.contentType = "application/json";
NetUtil.asyncFetch(channel, function(aStream, aResult) {

12
dom/apps/OfflineCacheInstaller.jsm
View File

@ -91,14 +91,10 @@ function storeCache(applicationCache, url, file, itemType, metadata) {
function readFile(aFile, aPrincipal, aCallback) {
let channel = NetUtil.newChannel2(aFile,
null,
null,
null, // aLoadingNode
aPrincipal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(aFile),
loadingPrincipal: aPrincipal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER});
channel.contentType = "plain/text";
NetUtil.asyncFetch(channel, function(aStream, aResult) {
if (!Components.isSuccessCode(aResult)) {

28
dom/apps/TrustedHostedAppsUtils.jsm
View File

@ -203,15 +203,11 @@ this.TrustedHostedAppsUtils = {
let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(
aApp.origin, aApp.localId, false);
let mRequestChannel = NetUtil.newChannel2(aApp.manifestURL,
null,
null,
null, // aLoadingNode
principal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
.QueryInterface(Ci.nsIHttpChannel);
let mRequestChannel = NetUtil.newChannel({
uri: aApp.manifestURL,
loadingPrincipal: principal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
).QueryInterface(Ci.nsIHttpChannel);
mRequestChannel.loadFlags |= Ci.nsIRequest.INHIBIT_CACHING;
mRequestChannel.notificationCallbacks =
AppsUtils.createLoadContext(aAppId, false);
@ -232,15 +228,11 @@ this.TrustedHostedAppsUtils = {
return;
}
let sRequestChannel = NetUtil.newChannel2(signatureURL,
null,
null,
null, // aLoadingNode
principal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
.QueryInterface(Ci.nsIHttpChannel);
let sRequestChannel = NetUtil.newChannel({
uri: signatureURL,
loadingPrincipal: principal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
).QueryInterface(Ci.nsIHttpChannel);
sRequestChannel.loadFlags |= Ci.nsIRequest.INHIBIT_CACHING;
sRequestChannel.notificationCallbacks =
AppsUtils.createLoadContext(aAppId, false);

28
dom/apps/Webapps.jsm
View File

@ -3527,25 +3527,17 @@ this.DOMApplicationRegistry = {
appURI, aNewApp.localId, false);
if (aIsLocalFileInstall) {
requestChannel = NetUtil.newChannel2(aFullPackagePath,
null,
null,
null, // aLoadingNode
principal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
.QueryInterface(Ci.nsIFileChannel);
requestChannel = NetUtil.newChannel({
uri: aFullPackagePath,
loadingPrincipal: principal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
).QueryInterface(Ci.nsIFileChannel);
} else {
requestChannel = NetUtil.newChannel2(aFullPackagePath,
null,
null,
null, // aLoadingNode
principal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
.QueryInterface(Ci.nsIHttpChannel);
requestChannel = NetUtil.newChannel({
uri: aFullPackagePath,
loadingPrincipal: principal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_OTHER}
).QueryInterface(Ci.nsIHttpChannel);
requestChannel.loadFlags |= Ci.nsIRequest.INHIBIT_CACHING;
}

11
dom/base/test/unit/test_cspreports.js
View File

@ -71,14 +71,9 @@ function makeTest(id, expectedJSON, useReportOnlyPolicy, callback) {
var selfuri = NetUtil.newURI(REPORT_SERVER_URI +
":" + REPORT_SERVER_PORT +
"/foo/self");
var selfchan = NetUtil.newChannel2(selfuri,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var selfchan = NetUtil.newChannel({
uri: selfuri,
loadUsingSystemPrincipal: true});
dump("Created test " + id + " : " + policy + "\n\n");

36
dom/base/test/unit/test_thirdpartyutil.js
View File

@ -41,44 +41,16 @@ function run_test() {
let spec2 = "http://bar.com/bar.html";
let uri1 = NetUtil.newURI(spec1);
let uri2 = NetUtil.newURI(spec2);
let channel1 = NetUtil.newChannel2(uri1,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel2 = NetUtil.newChannel2(uri2,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
let channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
// Create some file:// URIs.
let filespec1 = "file://foo.txt";
let filespec2 = "file://bar.txt";
let fileuri1 = NetUtil.newURI(filespec1);
let fileuri2 = NetUtil.newURI(filespec2);
let filechannel1 = NetUtil.newChannel2(fileuri1,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let filechannel2 = NetUtil.newChannel2(fileuri2,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let filechannel1 = NetUtil.newChannel({uri: fileuri1, loadUsingSystemPrincipal: true});
let filechannel2 = NetUtil.newChannel({uri: fileuri2, loadUsingSystemPrincipal: true});
// Test isThirdPartyURI.
do_check_false(util.isThirdPartyURI(uri1, uri1));

12
dom/contacts/fallback/ContactDB.jsm
View File

@ -124,14 +124,10 @@ ContactDB.prototype = {
}
}
let chan = jsm.NetUtil.newChannel2(contactsFile,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let chan = jsm.NetUtil.newChannel({
uri: NetUtil.newURI(contactsFile),
loadUsingSystemPrincipal: true});
let stream = chan.open();
// Obtain a converter to read from a UTF-8 encoded input stream.
let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]

11
dom/settings/SettingsDB.jsm
View File

@ -80,14 +80,9 @@ SettingsDB.prototype = {
}
}
let chan = NetUtil.newChannel2(settingsFile,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let chan = NetUtil.newChannel({
uri: NetUtil.newURI(settingsFile),
loadUsingSystemPrincipal: true});
let stream = chan.open();
// Obtain a converter to read from a UTF-8 encoded input stream.
let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]

18
extensions/cookie/test/unit/test_cookies_persistence.js
View File

@ -29,22 +29,8 @@ function do_run_test() {
var spec2 = "http://bar.com/bar.html";
var uri1 = NetUtil.newURI(spec1);
var uri2 = NetUtil.newURI(spec2);
var channel1 = NetUtil.newChannel2(uri1,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var channel2 = NetUtil.newChannel2(uri2,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
var channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
// Force the channel URI to be used when determining the originating URI of
// the channel.

18
extensions/cookie/test/unit/test_cookies_thirdparty.js
View File

@ -12,22 +12,8 @@ function run_test() {
var spec2 = "http://bar.com/bar.html";
var uri1 = NetUtil.newURI(spec1);
var uri2 = NetUtil.newURI(spec2);
var channel1 = NetUtil.newChannel2(uri1,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var channel2 = NetUtil.newChannel2(uri2,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
var channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
// test with cookies enabled
Services.prefs.setIntPref("network.cookie.cookieBehavior", 0);

18
extensions/cookie/test/unit/test_cookies_thirdparty_session.js
View File

@ -29,22 +29,8 @@ function do_run_test() {
var spec2 = "http://bar.com/bar.html";
var uri1 = NetUtil.newURI(spec1);
var uri2 = NetUtil.newURI(spec2);
var channel1 = NetUtil.newChannel2(uri1,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var channel2 = NetUtil.newChannel2(uri2,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
var channel1 = NetUtil.newChannel({uri: uri1, loadUsingSystemPrincipal: true});
var channel2 = NetUtil.newChannel({uri: uri2, loadUsingSystemPrincipal: true});
// Force the channel URI to be used when determining the originating URI of
// the channel.

10
mobile/android/tests/browser/robocop/testResourceSubstitutions.js
View File

@ -12,14 +12,8 @@ Cu.import("resource://gre/modules/NetUtil.jsm"); /*global NetUtil */
function readChannel(url) {
let deferred = Promise.defer();
let channel = NetUtil.newChannel2(url,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
channel.contentType = "text/plain";
NetUtil.asyncFetch(channel, function(inputStream, status) {

11
netwerk/test/browser/browser_NetUtil.js
View File

@ -36,14 +36,9 @@ function test_asyncFetchBadCert() {
ok(aRequest instanceof Ci.nsIHttpChannel, "request is an nsIHttpChannel");
// Now try again with a channel whose notificationCallbacks doesn't suprress errors
let channel = NetUtil.newChannel2("https://untrusted.example.com",
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({
uri: "https://untrusted.example.com",
loadUsingSystemPrincipal: true});
channel.notificationCallbacks = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIProgressEventSink,
Ci.nsIInterfaceRequestor]),

9
toolkit/components/addoncompat/RemoteAddonsParent.jsm
View File

@ -259,14 +259,7 @@ let AboutProtocolParent = {
let securityFlags = msg.data.securityFlags;
let contentPolicyType = msg.data.contentPolicyType;
try {
let channel = NetUtil.newChannel2(uri,
null,
null,
null, // aLoadingNode
loadingPrincipal,
null, // aTriggeringPrincipal
securityFlags,
contentPolicyType);
let channel = NetUtil.newChannel({uri, loadingPrincipal, securityFlags, contentPolicyType});
// We're not allowed to set channel.notificationCallbacks to a
// CPOW, since the setter for notificationCallbacks is in C++,

9
toolkit/components/downloads/test/unit/test_cancel_download_files_removed.js
View File

@ -90,14 +90,7 @@ function runNextTest()
let uri = "http://localhost:" +
httpserver.identity.primaryPort +
set.serverPath;
let channel = NetUtil.newChannel2(uri,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
let uriloader = Cc["@mozilla.org/uriloader;1"].getService(Ci.nsIURILoader);
uriloader.openURI(channel, Ci.nsIURILoader.IS_CONTENT_PREFERRED,
new WindowContext());

9
toolkit/components/downloads/test/unit/test_download_samename.js
View File

@ -112,14 +112,7 @@ function runNextTest()
let uri = "http://localhost:" +
httpserver.identity.primaryPort +
set.serverURL;
let channel = NetUtil.newChannel2(uri,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
let uriloader = Cc["@mozilla.org/uriloader;1"].getService(Ci.nsIURILoader);
uriloader.openURI(channel, Ci.nsIURILoader.IS_CONTENT_PREFERRED,
new WindowContext());

11
toolkit/devtools/server/actors/settings.js
View File

@ -23,14 +23,9 @@ exports.unregister = function(handle) {
};
function getDefaultSettings() {
let chan = NetUtil.newChannel2(settingsFile,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let chan = NetUtil.newChannel({
uri: NetUtil.newURI(settingsFile),
loadUsingSystemPrincipal: true});
let stream = chan.open();
// Obtain a converter to read from a UTF-8 encoded input stream.
let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]

9
toolkit/devtools/webconsole/network-helper.js
View File

@ -275,14 +275,7 @@ let NetworkHelper = {
*/
loadFromCache: function NH_loadFromCache(aUrl, aCharset, aCallback)
{
let channel = NetUtil.newChannel2(aUrl,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let channel = NetUtil.newChannel({uri: aUrl, loadUsingSystemPrincipal: true});
// Ensure that we only read from the cache and not the server.
channel.loadFlags = Ci.nsIRequest.LOAD_FROM_CACHE |

11
toolkit/mozapps/extensions/internal/XPIProvider.jsm
View File

@ -5571,14 +5571,9 @@ AddonInstall.prototype = {
let requireBuiltIn = Preferences.get(PREF_INSTALL_REQUIREBUILTINCERTS, true);
this.badCertHandler = new CertUtils.BadCertHandler(!requireBuiltIn);
this.channel = NetUtil.newChannel2(this.sourceURI,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
this.channel = NetUtil.newChannel({
uri: this.sourceURI,
loadUsingSystemPrincipal: true});
this.channel.notificationCallbacks = this;
if (this.channel instanceof Ci.nsIHttpChannel) {
this.channel.setRequestHeader("Moz-XPI-Update", "1", true);

12
toolkit/webapps/NativeApp.jsm
View File

@ -456,14 +456,10 @@ function downloadIcon(aIconURI) {
: Services.scriptSecurityManager
.getNoAppCodebasePrincipal(aIconURI);
let channel = NetUtil.newChannel2(aIconURI,
null,
null,
null, // aLoadingNode
principal,
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_IMAGE);
let channel = NetUtil.newChannel({
uri: aIconURI,
loadingPrincipal: principal,
contentPolicyType: Ci.nsIContentPolicy.TYPE_IMAGE});
let { BadCertHandler } = Cu.import("resource://gre/modules/CertUtils.jsm", {});
// Pass true to avoid optional redirect-cert-checking behavior.
channel.notificationCallbacks = new BadCertHandler(true);