Backed out changeset 7c4f0da2f1e5 (bug 1232792) on the chance it caused a bunch of b2g test bustage CLOSED TREE

This commit is contained in:
Wes Kocher 2016-01-11 14:20:34 -08:00
parent 153a015f5a
commit e3af6321e3

View File

@ -39,7 +39,6 @@ const NS_OBSERVER_SERVICE_CONTRACTID =
CU.import("resource://gre/modules/FileUtils.jsm");
CU.import("chrome://reftest/content/httpd.jsm", this);
CU.import("resource://gre/modules/Services.jsm");
CU.import("resource://gre/modules/NetUtil.jsm");
var gLoadTimeout = 0;
var gTimeoutHook = null;
@ -802,8 +801,13 @@ function ReadManifest(aURL, inherited_status, aFilter)
.getService(CI.nsIScriptSecurityManager);
var listURL = aURL;
var channel = NetUtil.newChannel({uri: aURL, loadUsingSystemPrincipal: true});
var inputStream = channel.open2();
var channel = gIOService.newChannelFromURI2(aURL,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
CI.nsILoadInfo.SEC_NORMAL,
CI.nsIContentPolicy.TYPE_OTHER);
var inputStream = channel.open();
if (channel instanceof Components.interfaces.nsIHttpChannel
&& channel.responseStatus != 200) {
gDumpLog("REFTEST TEST-UNEXPECTED-FAIL | | HTTP ERROR : " +