Bug 720985 - Make some tests stop polluting the global scope

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;

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;