Bug 1099585 - Make JS callers of ios.newChannel call ios.newChannel2 in suite/ (fix). r=neil a=Ratty in a CLOSED TREE
authorEdmund Wong <ewong@pw-wspx.org>
Tue, 21 Jul 2015 17:40:12 +0800
changeset 26249 07458a671842fcfaa3b29308dfa33654a1d1b555
parent 26248 093d47752c1c7f923de602d55623faba346d99bd
child 26250 39e76d5e07164030472e53cd0189c85bf678253e
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil, Ratty
bugs1099585
Bug 1099585 - Make JS callers of ios.newChannel call ios.newChannel2 in suite/ (fix). r=neil a=Ratty in a CLOSED TREE
suite/feeds/src/FeedWriter.js
--- a/suite/feeds/src/FeedWriter.js
+++ b/suite/feeds/src/FeedWriter.js
@@ -970,21 +970,21 @@ FeedWriter.prototype = {
    *        The window of the document invoking the BrowserFeedWriter
    */
   _getOriginalURI: function getOriginalURI(aWindow) {
     var chan = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
                       .getInterface(Components.interfaces.nsIWebNavigation)
                       .QueryInterface(Components.interfaces.nsIDocShell)
                       .currentDocumentChannel;
     var ios = Services.io;
-    var channel = ios.newChannelFromURI2(FEEDHANDLER_URI, null,
-                                         this._feedprincipal,
-                                         null,
-                                         Components.interfaces.nsILoadInfo.SEC_NORMAL,
-                                         Components.interfaces.nsIContentPolicy.TYPE_OTHER);
+    var channel = ios.newChannel2(FEEDHANDLER_URI, null, null, null,
+                                  this._feedprincipal,
+                                  null,
+                                  Components.interfaces.nsILoadInfo.SEC_NORMAL,
+                                  Components.interfaces.nsIContentPolicy.TYPE_OTHER);
     var resolvedURI = channel.URI;
 
     if (resolvedURI.equals(chan.URI))
       return chan.originalURI;
 
     return null;
   },