Merge pull request #5314 from yurydelendik/issue5313

Fixes names collisions in content.js

extensions/firefox/chrome/content.js

@@ -20,22 +20,26 @@
 
 'use strict';
 
-const Cc = Components.classes;
+(function contentScriptClosure() {
-const Ci = Components.interfaces;
+  // we need to use closure here -- we are running in the global context
-const Cm = Components.manager;
-const Cu = Components.utils;
-const Cr = Components.results;
 
-Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+  const Cc = Components.classes;
-Cu.import('resource://gre/modules/Services.jsm');
+  const Ci = Components.interfaces;
+  const Cm = Components.manager;
+  const Cu = Components.utils;
+  const Cr = Components.results;
 
-var isRemote = Services.appinfo.processType ===
+  Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+  Cu.import('resource://gre/modules/Services.jsm');
+
+  var isRemote = Services.appinfo.processType ===
     Services.appinfo.PROCESS_TYPE_CONTENT;
 
 // Factory that registers/unregisters a constructor as a component.
-function Factory() {}
+  function Factory() {
+  }
 
-Factory.prototype = {
+  Factory.prototype = {
     QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory]),
     _targetConstructor: null,
 
@@ -67,19 +71,19 @@ Factory.prototype = {
       // No longer used as of gecko 1.7.
       throw Cr.NS_ERROR_NOT_IMPLEMENTED;
     }
-};
+  };
 
-var pdfStreamConverterFactory = new Factory();
+  var pdfStreamConverterFactory = new Factory();
 
-function startup() {
+  function startup() {
     Cu.import('resource://pdf.js/PdfjsContentUtils.jsm');
     PdfjsContentUtils.init();
 
     Cu.import('resource://pdf.js/PdfStreamConverter.jsm');
     pdfStreamConverterFactory.register(PdfStreamConverter);
-}
+  }
 
-function shutdown() {
+  function shutdown() {
     // Remove the contract/component.
     pdfStreamConverterFactory.unregister();
     // Unload the converter
@@ -87,12 +91,13 @@ function shutdown() {
 
     PdfjsContentUtils.uninit();
     Cu.unload('resource://pdf.js/PdfjsContentUtils.jsm');
-}
+  }
 
-if (isRemote) {
+  if (isRemote) {
     startup();
 
     addMessageListener('PDFJS:Child:shutdown', function (e) {
       shutdown();
     });
-}
+  }
+})();