Merge pull request #2193 from brendandahl/princpal

Change how we get the resource principal.

extensions/firefox/components/PdfStreamConverter.js

@@ -536,9 +536,10 @@ PdfStreamConverter.prototype = {
       var securityManager = Cc['@mozilla.org/scriptsecuritymanager;1']
                             .getService(Ci.nsIScriptSecurityManager);
       var uri = ioService.newURI(PDF_VIEWER_WEB_PAGE, null, null);
-      // FF16 and below had getCodebasePrincipal (bug 774585)
+      // FF16 and below had getCodebasePrincipal, it was replaced by
-      var resourcePrincipal = 'getSimpleCodebasePrincipal' in securityManager ?
+      // getNoAppCodebasePrincipal (bug 758258).
-                              securityManager.getSimpleCodebasePrincipal(uri) :
+      var resourcePrincipal = 'getNoAppCodebasePrincipal' in securityManager ?
+                              securityManager.getNoAppCodebasePrincipal(uri) :
                               securityManager.getCodebasePrincipal(uri);
       channel.owner = resourcePrincipal;
     }