Backed out changeset d89476df1931 (bug 1147562) for test_bug894586.js failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 09 Apr 2015 15:00:50 -0400
changeset 256459 95436ea8899b5e2bc9d02822591981d1729af7e3
parent 256458 6ac33b20b2dd44c5792228c9d6ee380e7d71332a
child 256460 ff04a9792eb2ae7aea9a5651e831c0a33c456a06
push id1476
push usergijskruitbosch@gmail.com
push dateFri, 10 Apr 2015 12:37:44 +0000
bugs1147562, 894586
milestone40.0a1
backs outd89476df19319c9bada1cf5d4bca81fd2f079cac
Backed out changeset d89476df1931 (bug 1147562) for test_bug894586.js failures. CLOSED TREE
netwerk/test/unit/test_bug894586.js
netwerk/test/unit/test_protocolproxyservice.js
--- a/netwerk/test/unit/test_bug894586.js
+++ b/netwerk/test/unit/test_bug894586.js
@@ -19,17 +19,16 @@ 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,19 +46,16 @@ 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;
   }
 };