Bug 1436310 - Port bug 1432992 to calendar: Remove definitions of Ci, Cr, Cc, and Cu. r=philipp
authorRichard Marti <richard.marti@gmail.com>
Wed, 07 Feb 2018 21:02:06 +0100
changeset 23270 3d13a7832ad7d5a2e98ce4af0416b1101d61ff2c
parent 23269 a0716b4dadb52f9aaf818a71bdfa5bd8e88eca72
child 23271 f842916b9211d69fdda4075aa3dc8b69e37a25ec
push id14064
push usermozilla@jorgk.com
push dateWed, 07 Feb 2018 23:39:28 +0000
treeherdercomm-central@f842916b9211 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs1436310, 1432992
Bug 1436310 - Port bug 1432992 to calendar: Remove definitions of Ci, Cr, Cc, and Cu. r=philipp
calendar/lightning/components/calItipProtocolHandler.js
calendar/providers/ics/calICSCalendar.js
calendar/test/unit/head_consts.js
--- a/calendar/lightning/components/calItipProtocolHandler.js
+++ b/calendar/lightning/components/calItipProtocolHandler.js
@@ -1,17 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
 
-var Ci = Components.interfaces;
-
 var ITIP_HANDLER_MIMETYPE = "application/x-itip-internal";
 var ITIP_HANDLER_PROTOCOL = "moz-cal-handle-itip";
 var NS_ERROR_WONT_HANDLE_CONTENT = 0x805d0001;
 
 
 function NYI() {
     throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 }
--- a/calendar/providers/ics/calICSCalendar.js
+++ b/calendar/providers/ics/calICSCalendar.js
@@ -14,17 +14,16 @@ ChromeUtils.import("resource://calendar/
 // calICSCalendar.js
 //
 // This is a non-sync ics file. It reads the file pointer to by uri when set,
 // then writes it on updates. External changes to the file will be
 // ignored and overwritten.
 //
 // XXX Should do locks, so that external changes are not overwritten.
 
-var Ci = Components.interfaces;
 var calICalendar = Components.interfaces.calICalendar;
 var calIErrors = Components.interfaces.calIErrors;
 
 function icsNSResolver(prefix) {
     const ns = { D: "DAV:" }; // eslint-disable-line id-length
     return ns[prefix] || null;
 }
 
--- a/calendar/test/unit/head_consts.js
+++ b/calendar/test/unit/head_consts.js
@@ -14,18 +14,16 @@ ChromeUtils.import("resource://gre/modul
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 ChromeUtils.import("resource://testing-common/AppInfo.jsm");
 
 ChromeUtils.defineModuleGetter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm");
 
 updateAppInfo();
 
-var { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
-
 (function() {
     let bindir = Services.dirsvc.get("CurProcD", Components.interfaces.nsIFile);
     bindir.append("extensions");
     bindir.append("{e2fda1a4-762b-4020-b5ad-a41df1933103}");
     bindir.append("chrome.manifest");
     dump("Loading" + bindir.path + "\n");
     Components.manager.autoRegister(bindir);
 })();