From cfde50660470e67cfac61b2f56ff1ae9073ba101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 3 Feb 2012 10:13:41 +0100
Subject: [PATCH] Bug 720985 - Make some tests stop polluting the global scope

---
 browser/devtools/webconsole/test/browser_gcli_helpers.js      | 4 +++-
 .../test/browser/browser_addonrepository_performance.js       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/browser/devtools/webconsole/test/browser_gcli_helpers.js b/browser/devtools/webconsole/test/browser_gcli_helpers.js
index 0a397bdd461..541a5b19977 100644
--- a/browser/devtools/webconsole/test/browser_gcli_helpers.js
+++ b/browser/devtools/webconsole/test/browser_gcli_helpers.js
@@ -5,7 +5,9 @@
 // - https://github.com/mozilla/gcli/blob/master/docs/index.md
 // - https://wiki.mozilla.org/DevTools/Features/GCLI
 
-Components.utils.import("resource:///modules/gcli.jsm");
+let tmp = {};
+Components.utils.import("resource:///modules/gcli.jsm", tmp);
+let gcli = tmp.gcli;
 
 let hud;
 let gcliterm;
diff --git a/toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js b/toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js
index af1890e097b..aa023b3079e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js
@@ -4,7 +4,9 @@
 
 // Tests that the metadata request includes startup time measurements
 
-Components.utils.import("resource://gre/modules/AddonRepository.jsm");
+let tmp = {};
+Components.utils.import("resource://gre/modules/AddonRepository.jsm", tmp);
+let AddonRepository = tmp.AddonRepository;
 
 var gManagerWindow;
 var gProvider;