Bug 1608610 - Remove XPCShell function that loads Lightning XPI. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Thu, 16 Jan 2020 11:09:04 -0500
changeset 37251 20890131209c2148fd2318ad2eed4e5aabc9f12a
parent 37250 b27c5d446d95d74656fcbebc4b37568b6d98a746
child 37252 cd731183002b27c4565eecdf5b5d2295eb88fd95
push id2552
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:24:16 +0000
treeherdercomm-beta@f95a6f4408a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1608610
Bug 1608610 - Remove XPCShell function that loads Lightning XPI. r=Fallen
calendar/test/unit/head_consts.js
--- a/calendar/test/unit/head_consts.js
+++ b/calendar/test/unit/head_consts.js
@@ -7,46 +7,16 @@ var { Services } = ChromeUtils.import("r
 var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 
 var { updateAppInfo } = ChromeUtils.import("resource://testing-common/AppInfo.jsm");
 
 ChromeUtils.defineModuleGetter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm");
 
 updateAppInfo();
 
-(function() {
-  let manager = Cc["@mozilla.org/component-manager-extra;1"].getService(
-    Ci.nsIComponentManagerExtra
-  );
-
-  let bindir = Services.dirsvc.get("CurProcD", Ci.nsIFile);
-  if (!AppConstants.NIGHTLY_BUILD) {
-    bindir.append("distribution");
-  }
-  bindir.append("extensions");
-
-  let xpiFile = bindir.clone();
-  xpiFile.append("{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi");
-
-  if (xpiFile.exists()) {
-    dump("Loading " + xpiFile.path + "\n");
-    manager.addLegacyExtensionManifestLocation(xpiFile);
-  } else {
-    // The XPI file is created by the automation, and not available on a local build.
-    // Use the unpacked version instead.
-    bindir.append("{e2fda1a4-762b-4020-b5ad-a41df1933103}");
-    dump("Loading " + bindir.path + "\n");
-    manager.addLegacyExtensionManifestLocation(bindir);
-  }
-
-  // Make sure to load the backend loader as early as possible, as xpcshell doesn't have the
-  // normal app flow with profile-after-change et al.
-  Cc["@mozilla.org/calendar/backend-loader;1"].getService();
-})();
-
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
 
 function createDate(aYear, aMonth, aDay, aHasTime, aHour, aMinute, aSecond, aTimezone) {
   let date = Cc["@mozilla.org/calendar/datetime;1"].createInstance(Ci.calIDateTime);
   date.resetTo(
     aYear,
     aMonth,
     aDay,