Bug 1535450 - remove lowercase mailServices.js and MailUtils.js (not .jsm) shim. r=darktrojan
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Fri, 15 Mar 2019 08:57:42 +0200
changeset 26101 6560ce144a7188797f666c4acbe456d2ab30d3d2
parent 26100 f2b728425eaf68a3c61d5f6c749f5400df23dcc5
child 26102 11f46ea9ea725e9ca1734c99653de83b18d68e3f
push id15670
push usermozilla@jorgk.com
push dateFri, 15 Mar 2019 18:52:34 +0000
treeherdercomm-central@6560ce144a71 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1535450
Bug 1535450 - remove lowercase mailServices.js and MailUtils.js (not .jsm) shim. r=darktrojan
mail/base/modules/MailUtils.js
mail/base/modules/moz.build
mailnews/base/test/unit/test_mailServices.js
mailnews/base/util/mailServices.js
mailnews/base/util/moz.build
deleted file mode 100644
--- a/mail/base/modules/MailUtils.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 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/. */
-
-var EXPORTED_SYMBOLS = ["MailUtils"];
-
-var {MailUtils} = ChromeUtils.import("resource:///modules/MailUtils.jsm");
-
-var {Deprecated} = ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
-Deprecated.warning(
-    "MailUtils.js has been renamed MailUtils.jsm",
-    "https://bugzilla.mozilla.org/show_bug.cgi?id=1498041",
-    Components.stack.caller
-);
--- a/mail/base/modules/moz.build
+++ b/mail/base/modules/moz.build
@@ -7,17 +7,16 @@ EXTRA_JS_MODULES += [
     'AttachmentChecker.jsm',
     'DBViewWrapper.jsm',
     'DisplayNameUtils.jsm',
     'ExtensionsUI.jsm',
     'GlobalPopupNotifications.jsm',
     'MailConsts.jsm',
     'MailInstrumentation.jsm',
     'MailMigrator.jsm',
-    'MailUtils.js',
     'MailUtils.jsm',
     'MailViewManager.jsm',
     'MsgHdrSyntheticView.jsm',
     'QuickFilterManager.jsm',
     'SearchSpec.jsm',
     'SessionStoreManager.jsm',
     'SummaryFrameManager.jsm',
     'TagUtils.jsm',
--- a/mailnews/base/test/unit/test_mailServices.js
+++ b/mailnews/base/test/unit/test_mailServices.js
@@ -26,17 +26,11 @@ function check_services() {
   check_service("mfn", Ci.nsIMsgFolderNotificationService);
   check_service("headerParser", Ci.nsIMsgHeaderParser);
   check_service("mimeConverter", Ci.nsIMimeConverter);
   check_service("tags", Ci.nsIMsgTagService);
   check_service("filters", Ci.nsIMsgFilterService);
   check_service("junk", Ci.nsIJunkMailPlugin);
 }
 
-function check_shim() {
-  let { MailServices: oldMailServices } = ChromeUtils.import("resource:///modules/mailServices.js");
-  Assert.equal(oldMailServices, MailServices);
-}
-
 function run_test() {
   check_services();
-  check_shim();
 }
deleted file mode 100644
--- a/mailnews/base/util/mailServices.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 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/. */
-
-var EXPORTED_SYMBOLS = ["MailServices"];
-
-var {MailServices} = ChromeUtils.import("resource:///modules/MailServices.jsm");
-
-const {Deprecated} = ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
-Deprecated.warning(
-    "mailServices.js has been renamed MailServices.jsm",
-    "https://bugzilla.mozilla.org/show_bug.cgi?id=1487572",
-    Components.stack.caller
-);
--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -53,17 +53,16 @@ EXTRA_JS_MODULES += [
     'errUtils.js',
     'folderUtils.jsm',
     'hostnameUtils.jsm',
     'IOUtils.js',
     'iteratorUtils.jsm',
     'jsTreeSelection.js',
     'JXON.js',
     'mailnewsMigrator.js',
-    'mailServices.js',
     'MailServices.jsm',
     'mailstoreConverter.jsm',
     'msgDBCacheManager.js',
     'OAuth2.jsm',
     'OAuth2Providers.jsm',
     'StringBundle.js',
     'templateUtils.js',
     'traceHelper.js',