Merge pull request #6489 from Snuffleupagus/bug-1202902

Upstream changes from Bug 1202902 - Give loader scripts and XUL frame scripts a lexical scope that doesn't break everything?

extensions/firefox/content/PdfJs-stub.jsm

@@ -22,6 +22,6 @@
 // See https://mxr.mozilla.org/mozilla-central/source/browser/components/nsBrowserGlue.js
 var EXPORTED_SYMBOLS = ['PdfJs'];
 
-let PdfJs = {
+var PdfJs = {
   init: function PdfJs_init() {}
 };

extensions/firefox/content/PdfJs.jsm

@@ -43,7 +43,7 @@ const PDF_CONTENT_TYPE = 'application/pdf';
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
 
-let Svc = {};
+var Svc = {};
 XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
                                    '@mozilla.org/mime;1',
                                    'nsIMIMEService');
@@ -130,7 +130,7 @@ Factory.prototype = {
   }
 };
 
-let PdfJs = {
+var PdfJs = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
   _registered: false,
   _initialized: false,

extensions/firefox/content/PdfjsChromeUtils.jsm

@@ -32,7 +32,7 @@ const PDF_CONTENT_TYPE = 'application/pdf';
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
 
-let Svc = {};
+var Svc = {};
 XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
                                    '@mozilla.org/mime;1',
                                    'nsIMIMEService');

extensions/firefox/content/PdfjsContentUtils.jsm

@@ -29,7 +29,7 @@ const Cu = Components.utils;
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
 
-let PdfjsContentUtils = {
+var PdfjsContentUtils = {
   _mm: null,
 
   /*