Bug 1147562 - Update remaining callsites of newChannel before landing the shim in netwerk/ (r=jduell)
--- a/netwerk/test/unit/test_bug894586.js
+++ b/netwerk/test/unit/test_bug894586.js
@@ -19,16 +19,17 @@ ProtocolHandler.prototype = {
get defaultPort() -1,
get protocolFlags() Ci.nsIProtocolHandler.URI_NORELATIVE |
Ci.nsIProtocolHandler.URI_NOAUTH |
Ci.nsIProtocolHandler.URI_IS_UI_RESOURCE |
Ci.nsIProtocolHandler.URI_IS_LOCAL_RESOURCE |
Ci.nsIProtocolHandler.URI_NON_PERSISTABLE |
Ci.nsIProtocolHandler.URI_SYNC_LOAD_IS_OK,
newURI: function(aSpec, aOriginCharset, aBaseURI) this.uri,
+ newChannel2: function(aURI, aLoadInfo) this,
newChannel: function(aURI) this,
allowPort: function(port, scheme) port != -1,
/** nsIChannel */
get originalURI() this.uri,
get URI() this.uri,
owner: null,
notificationCallbacks: null,
--- a/netwerk/test/unit/test_protocolproxyservice.js
+++ b/netwerk/test/unit/test_protocolproxyservice.js
@@ -46,16 +46,19 @@ TestProtocolHandler.prototype = {
Components.interfaces.nsIProtocolHandler.ALLOWS_PROXY |
Components.interfaces.nsIProtocolHandler.URI_DANGEROUS_TO_LOAD,
newURI: function(spec, originCharset, baseURI) {
var uri = Components.classes["@mozilla.org/network/simple-uri;1"]
.createInstance(Components.interfaces.nsIURI);
uri.spec = spec;
return uri;
},
+ newChannel2: function(uri, aLoadInfo) {
+ throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+ },
newChannel: function(uri) {
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
},
allowPort: function(port, scheme) {
return true;
}
};