From 0dbfd855884637c4dd713df1c5733c108e35e2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 6 Apr 2012 22:02:15 +0200
Subject: [PATCH] Bug 723953 - Fennec chrome scripts and tests leak global
 variables. r=mbrubeck

---
 mobile/xul/chrome/content/browser-scripts.js  | 18 +++++++-----
 mobile/xul/chrome/content/browser-ui.js       |  4 ---
 mobile/xul/chrome/content/browser.xul         |  2 +-
 mobile/xul/chrome/content/downloads.js        | 11 +++----
 mobile/xul/chrome/content/extensions.js       | 29 ++++++-------------
 mobile/xul/chrome/tests/browser_addons.js     |  5 ----
 .../chrome/tests/browser_addons_locales.js    |  6 ++--
 mobile/xul/chrome/tests/browser_contacts.js   |  4 ++-
 .../chrome/tests/browser_localerepository.js  |  5 ++--
 .../tests/browser_localerepository_buildid.js |  5 ++--
 .../tests/browser_localerepository_pref.js    |  5 ++--
 mobile/xul/chrome/tests/browser_vkb.js        |  2 +-
 testing/mochitest/browser-test.js             | 28 ------------------
 13 files changed, 42 insertions(+), 82 deletions(-)

diff --git a/mobile/xul/chrome/content/browser-scripts.js b/mobile/xul/chrome/content/browser-scripts.js
index aa4ed082d362..561948f459f4 100644
--- a/mobile/xul/chrome/content/browser-scripts.js
+++ b/mobile/xul/chrome/content/browser-scripts.js
@@ -42,15 +42,17 @@ Cu.import("resource://gre/modules/Services.jsm");
 /**
  * Delay load some JS modules
  */
-XPCOMUtils.defineLazyGetter(this, "PluralForm", function() {
-  Cu.import("resource://gre/modules/PluralForm.jsm");
-  return PluralForm;
-});
+XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
+                                  "resource://gre/modules/PluralForm.jsm");
 
-XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
-  Cu.import("resource://gre/modules/PlacesUtils.jsm");
-  return PlacesUtils;
-});
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+                                  "resource://gre/modules/PlacesUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
+                                  "resource://gre/modules/AddonManager.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
+                                  "resource://gre/modules/NetUtil.jsm");
 
 /* window.Rect is used by http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-Rect
  * so it is not possible to set a lazy getter for Geometry.jsm
diff --git a/mobile/xul/chrome/content/browser-ui.js b/mobile/xul/chrome/content/browser-ui.js
index f8c833845990..b4923126bea2 100644
--- a/mobile/xul/chrome/content/browser-ui.js
+++ b/mobile/xul/chrome/content/browser-ui.js
@@ -37,10 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/AddonManager.jsm");
-
 [
   ["AllPagesList", "popup_autocomplete", "cmd_openLocation"],
   ["HistoryList", "history-items", "cmd_history"],
diff --git a/mobile/xul/chrome/content/browser.xul b/mobile/xul/chrome/content/browser.xul
index ad35df46ccbb..9bae8cfe9fdd 100644
--- a/mobile/xul/chrome/content/browser.xul
+++ b/mobile/xul/chrome/content/browser.xul
@@ -81,8 +81,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml">
 
   <script type="application/javascript" src="chrome://browser/content/browser.js"/>
-  <script type="application/javascript" src="chrome://browser/content/browser-ui.js"/>
   <script type="application/javascript" src="chrome://browser/content/browser-scripts.js"/>
+  <script type="application/javascript" src="chrome://browser/content/browser-ui.js"/>
   <script type="application/javascript" src="chrome://browser/content/Util.js"/>
   <script type="application/javascript" src="chrome://browser/content/input.js"/>
 
diff --git a/mobile/xul/chrome/content/downloads.js b/mobile/xul/chrome/content/downloads.js
index ae222bfb0ddc..de98a020b380 100644
--- a/mobile/xul/chrome/content/downloads.js
+++ b/mobile/xul/chrome/content/downloads.js
@@ -35,8 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
-
 #ifdef ANDROID
 const URI_GENERIC_ICON_DOWNLOAD = "drawable://alertdownloads";
 #else
@@ -299,7 +297,7 @@ var DownloadsView = {
     let fileSize = Number(aItem.getAttribute("maxBytes"));
     let sizeText = strings.GetStringFromName("downloadsUnknownSize");
     if (fileSize >= 0) {
-      let [size, unit] = DownloadUtils.convertByteUnits(fileSize);
+      let [size, unit] = this._DownloadUtils.convertByteUnits(fileSize);
       sizeText = this._replaceInsert(strings.GetStringFromName("downloadsKnownSize"), 1, size);
       sizeText = this._replaceInsert(sizeText, 2, unit);
     }
@@ -308,7 +306,7 @@ var DownloadsView = {
     status = this._replaceInsert(strings.GetStringFromName("downloadsStatus"), 1, sizeText);
 
     // Insert 2 is the eTLD + 1 or other variations of the host
-    let [displayHost, fullHost] = DownloadUtils.getURIHost(this._getReferrerOrSource(aItem));
+    let [displayHost, fullHost] = this._DownloadUtils.getURIHost(this._getReferrerOrSource(aItem));
     status = this._replaceInsert(status, 2, displayHost);
   
     // Insert 3 is the left time if download status is DOWNLOADING
@@ -318,7 +316,7 @@ var DownloadsView = {
       let passedTime = (Date.now() - aItem.getAttribute("startTime"))/1000;
       let totalTime = (passedTime / downloadSize) * fileSize;
       let leftTime = totalTime - passedTime;
-      let [time, lastTime] = DownloadUtils.getTimeLeft(leftTime);
+      let [time, lastTime] = this._DownloadUtils.getTimeLeft(leftTime);
 
       let stringTime = this._replaceInsert(strings.GetStringFromName("downloadsTime"), 1, time);
       status = status + " " + stringTime;
@@ -492,6 +490,9 @@ var DownloadsView = {
   }
 };
 
+XPCOMUtils.defineLazyModuleGetter(DownloadsView, "_DownloadUtils",
+                                  "resource://gre/modules/DownloadUtils.jsm", "DownloadUtils");
+
 // DownloadProgressListener is used for managing the DownloadsView UI. This listener
 // is only active if the view has been completely initialized.
 function DownloadProgressListener() { }
diff --git a/mobile/xul/chrome/content/extensions.js b/mobile/xul/chrome/content/extensions.js
index 0dea6dc54b68..06ad94bb1c5d 100644
--- a/mobile/xul/chrome/content/extensions.js
+++ b/mobile/xul/chrome/content/extensions.js
@@ -49,21 +49,6 @@ const URI_GENERIC_ICON_XPINSTALL = "chrome://browser/skin/images/alert-addons-30
 #endif
 const ADDONS_NOTIFICATION_NAME = "addons";
 
-XPCOMUtils.defineLazyGetter(this, "AddonManager", function() {
-  Cu.import("resource://gre/modules/AddonManager.jsm");
-  return AddonManager;
-});
-
-XPCOMUtils.defineLazyGetter(this, "AddonRepository", function() {
-  Cu.import("resource://gre/modules/AddonRepository.jsm");
-  return AddonRepository;
-});
-
-XPCOMUtils.defineLazyGetter(this, "NetUtil", function() {
-  Cu.import("resource://gre/modules/NetUtil.jsm");
-  return NetUtil;
-});
-
 var ExtensionsView = {
   _strings: {},
   _list: null,
@@ -565,18 +550,18 @@ var ExtensionsView = {
     // Make sure we're online before attempting to load
     Util.forceOnline();
 
-    if (AddonRepository.isSearching)
-      AddonRepository.cancelSearch();
+    if (this._AddonRepository.isSearching)
+      this._AddonRepository.cancelSearch();
 
     let strings = Strings.browser;
     if (aTerms) {
       AddonSearchResults.selectFirstResult = aSelectFirstResult;
       this.displaySectionMessage("repo", strings.GetStringFromName("addonsSearchStart.label"), strings.GetStringFromName("addonsSearchStart.button"), false);
-      AddonRepository.searchAddons(aTerms, Services.prefs.getIntPref(PREF_GETADDONS_MAXRESULTS), AddonSearchResults);
+      this._AddonRepository.searchAddons(aTerms, Services.prefs.getIntPref(PREF_GETADDONS_MAXRESULTS), AddonSearchResults);
     }
     else {
       this.displaySectionMessage("repo", strings.GetStringFromName("addonsSearchStart.label"), strings.GetStringFromName("addonsSearchStart.button"), false);
-      AddonRepository.retrieveRecommendedAddons(Services.prefs.getIntPref(PREF_GETADDONS_MAXRESULTS), RecommendedSearchResults);
+      this._AddonRepository.retrieveRecommendedAddons(Services.prefs.getIntPref(PREF_GETADDONS_MAXRESULTS), RecommendedSearchResults);
     }
   },
 
@@ -905,6 +890,9 @@ function searchFailed() {
   let failButton = strings.GetStringFromName("addonsSearchFail.retryButton");
   ExtensionsView.displaySectionMessage("repo", failLabel, failButton, true);
 }
+ 
+XPCOMUtils.defineLazyModuleGetter(ExtensionsView, "_AddonRepository",
+                                  "resource://gre/modules/AddonRepository.jsm", "AddonRepository");
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -914,7 +902,8 @@ var RecommendedSearchResults = {
 
   searchSucceeded: function(aAddons, aAddonCount, aTotalResults) {
     this.cache = aAddons;
-    AddonRepository.searchAddons(" ", Services.prefs.getIntPref(PREF_GETADDONS_MAXRESULTS), BrowseSearchResults);
+    ExtensionsView._AddonRepository.searchAddons(" ", Services.prefs.getIntPref(PREF_GETADDONS_MAXRESULTS),
+                                                 BrowseSearchResults);
   },
 
   searchFailed: searchFailed
diff --git a/mobile/xul/chrome/tests/browser_addons.js b/mobile/xul/chrome/tests/browser_addons.js
index 86df8200889a..1c0da14d6bc1 100644
--- a/mobile/xul/chrome/tests/browser_addons.js
+++ b/mobile/xul/chrome/tests/browser_addons.js
@@ -2,11 +2,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
-Components.utils.import("resource://gre/modules/AddonUpdateChecker.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/NetUtil.jsm");
-
 const RELATIVE_DIR = "browser/mobile/chrome/tests/";
 const TESTROOT     = "http://example.com/" + RELATIVE_DIR;
 const TESTROOT2    = "http://example.org/" + RELATIVE_DIR;
diff --git a/mobile/xul/chrome/tests/browser_addons_locales.js b/mobile/xul/chrome/tests/browser_addons_locales.js
index 1d9bc1add664..ffb24b9f6d55 100644
--- a/mobile/xul/chrome/tests/browser_addons_locales.js
+++ b/mobile/xul/chrome/tests/browser_addons_locales.js
@@ -1,9 +1,9 @@
 var localeList = serverRoot + "locales_list.sjs";
 var PREF_LOCALE_LIST = "extensions.getLocales.get.url";
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/LocaleRepository.jsm");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
+let tmp = {};
+Components.utils.import("resource://gre/modules/LocaleRepository.jsm", tmp);
+let LocaleRepository = tmp.LocaleRepository;
 
 function test() {
   waitForExplicitFinish();
diff --git a/mobile/xul/chrome/tests/browser_contacts.js b/mobile/xul/chrome/tests/browser_contacts.js
index 47d61ac93cf7..ce191942094b 100644
--- a/mobile/xul/chrome/tests/browser_contacts.js
+++ b/mobile/xul/chrome/tests/browser_contacts.js
@@ -1,6 +1,8 @@
 
 // pull in the Contacts service
-Components.utils.import("resource:///modules/contacts.jsm");
+let tmp = {};
+Components.utils.import("resource:///modules/contacts.jsm", tmp);
+let Contacts = tmp.Contacts;
 
 let fac = Cc["@mozilla.org/satchel/form-autocomplete;1"].getService(Ci.nsIFormAutoComplete);
 let fh = Cc["@mozilla.org/satchel/form-history;1"].getService(Ci.nsIFormHistory2);
diff --git a/mobile/xul/chrome/tests/browser_localerepository.js b/mobile/xul/chrome/tests/browser_localerepository.js
index 63de102580bf..29d3cecd305b 100644
--- a/mobile/xul/chrome/tests/browser_localerepository.js
+++ b/mobile/xul/chrome/tests/browser_localerepository.js
@@ -1,8 +1,9 @@
 var localeList = serverRoot + "locales_list.sjs";
 var PREF_LOCALE_LIST = "extensions.getLocales.get.url";
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/LocaleRepository.jsm");
+let tmp = {};
+Components.utils.import("resource://gre/modules/LocaleRepository.jsm", tmp);
+let LocaleRepository = tmp.LocaleRepository;
 
 function test() {
   waitForExplicitFinish();
diff --git a/mobile/xul/chrome/tests/browser_localerepository_buildid.js b/mobile/xul/chrome/tests/browser_localerepository_buildid.js
index 9a3689c565ae..5c51e9dbc9c3 100644
--- a/mobile/xul/chrome/tests/browser_localerepository_buildid.js
+++ b/mobile/xul/chrome/tests/browser_localerepository_buildid.js
@@ -1,8 +1,9 @@
 var localeList = serverRoot + "locales_list.sjs";
 var PREF_LOCALE_LIST = "extensions.getLocales.get.url";
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/LocaleRepository.jsm");
+let tmp = {};
+Components.utils.import("resource://gre/modules/LocaleRepository.jsm", tmp);
+let LocaleRepository = tmp.LocaleRepository;
 
 function test() {
   waitForExplicitFinish();
diff --git a/mobile/xul/chrome/tests/browser_localerepository_pref.js b/mobile/xul/chrome/tests/browser_localerepository_pref.js
index bc94c1280fc9..cabf357ef0d6 100644
--- a/mobile/xul/chrome/tests/browser_localerepository_pref.js
+++ b/mobile/xul/chrome/tests/browser_localerepository_pref.js
@@ -1,8 +1,9 @@
 var localeList = serverRoot + "locales_list.sjs";
 var PREF_LOCALE_LIST = "extensions.getLocales.get.url";
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/LocaleRepository.jsm");
+let tmp = {};
+Components.utils.import("resource://gre/modules/LocaleRepository.jsm", tmp);
+let LocaleRepository = tmp.LocaleRepository;
 
 function test() {
   waitForExplicitFinish();
diff --git a/mobile/xul/chrome/tests/browser_vkb.js b/mobile/xul/chrome/tests/browser_vkb.js
index d20efe6c75a2..d3fbc20f1b42 100644
--- a/mobile/xul/chrome/tests/browser_vkb.js
+++ b/mobile/xul/chrome/tests/browser_vkb.js
@@ -43,7 +43,7 @@ let VKBObserver = {
   observe: function(aTopic, aSubject, aData) {
     if (this._enabled != parseInt(aData)) {
       this._enabled = parseInt(aData);
-      VKBstateHasChanged = true;
+      VKBStateHasChanged = true;
     }
   }
 };
diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
index 9fc6d99f0d62..0d88c0dd647d 100644
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -96,34 +96,6 @@ Tester.prototype = {
     this._globalProperties = Object.keys(window);
     this._globalPropertyWhitelist = ["navigator", "constructor", "Application",
       "__SS_tabsToRestore", "__SSi", "webConsoleCommandController",
-
-      // Temporarily added to whitelist for Fennec tests:
-      "AddonUpdateChecker",
-      "PlacesAggregatedTransaction",
-      "PlacesCreateFolderTransaction",
-      "PlacesCreateBookmarkTransaction",
-      "PlacesCreateSeparatorTransaction",
-      "PlacesCreateLivemarkTransaction",
-      "PlacesMoveItemTransaction",
-      "PlacesRemoveItemTransaction",
-      "PlacesEditItemTitleTransaction",
-      "PlacesEditBookmarkURITransaction",
-      "PlacesSetItemAnnotationTransaction",
-      "PlacesSetPageAnnotationTransaction",
-      "PlacesEditBookmarkKeywordTransaction",
-      "PlacesEditBookmarkPostDataTransaction",
-      "PlacesEditLivemarkSiteURITransaction",
-      "PlacesEditLivemarkFeedURITransaction",
-      "PlacesEditItemDateAddedTransaction",
-      "PlacesEditItemLastModifiedTransaction",
-      "PlacesSortFolderByNameTransaction",
-      "PlacesTagURITransaction",
-      "PlacesUntagURITransaction",
-      "DownloadUtils",
-      "AddonRepository",
-      "LocaleRepository",
-      "Contacts",
-      "VKBstateHasChanged"
     ];
 
     if (this.tests.length)