From 536bc9be40ca700fef0a70e4e8929342db1d86c6 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 12 Apr 2018 06:16:44 -0400
Subject: Revert "[PALEMOON] Fix redeclarations of shorthand Cc, Ci, Cu"

This reverts commit 6fde853fa8276926f30c7135bdd5f68de3afc35a.
---
 application/palemoon/base/content/autorecovery.js                | 4 ++++
 application/palemoon/base/content/browser.js                     | 1 -
 application/palemoon/base/content/padlock.js                     | 3 +++
 application/palemoon/components/places/content/placesOverlay.xul | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/palemoon/base/content/autorecovery.js b/application/palemoon/base/content/autorecovery.js
index c24d1bfe4..29ccaed3f 100644
--- a/application/palemoon/base/content/autorecovery.js
+++ b/application/palemoon/base/content/autorecovery.js
@@ -10,6 +10,10 @@
  * have been properly initialized already.
  */
 
+let Cc = Components.classes;
+let Ci = Components.interfaces;
+let Cu = Components.utils;
+
 // Services = object with smart getters for common XPCOM services
 Cu.import("resource://gre/modules/Services.jsm");
 
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 1b9d9b967..dd55cd8ef 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -3,7 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-let Cc = Components.classes;
 let Ci = Components.interfaces;
 let Cu = Components.utils;
 
diff --git a/application/palemoon/base/content/padlock.js b/application/palemoon/base/content/padlock.js
index 9e6715769..53477fd17 100644
--- a/application/palemoon/base/content/padlock.js
+++ b/application/palemoon/base/content/padlock.js
@@ -1,3 +1,6 @@
+let Cc = Components.classes;
+let Ci = Components.interfaces;
+let Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 var padlock_PadLock =
diff --git a/application/palemoon/components/places/content/placesOverlay.xul b/application/palemoon/components/places/content/placesOverlay.xul
index 30319a6ac..dd4d50f01 100644
--- a/application/palemoon/components/places/content/placesOverlay.xul
+++ b/application/palemoon/components/places/content/placesOverlay.xul
@@ -20,8 +20,8 @@
   <script type="application/javascript"><![CDATA[
     // TODO: Bug 406371.
     // A bunch of browser code depends on us defining these, sad but true :(
-    // var Cc = Components.classes;
-    // var Ci = Components.interfaces;
+    var Cc = Components.classes;
+    var Ci = Components.interfaces;
     var Cr = Components.results;
 
     Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
-- 
cgit v1.2.3