Bug 1393371 - Remove unused references to the nsIAtomService. r=jorgk
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 24 Aug 2017 15:42:19 +1000
changeset 22033 95363809a3e833e2cb2d376ea0a3be73affabc94
parent 22032 56c3a9e0cbdacd2620f060dea62abefb5ca359cf
child 22034 428c1ea1553b8d8490667fd2b72e80c012eb2ff9
push id13450
push usermozilla@jorgk.com
push dateThu, 24 Aug 2017 11:52:08 +0000
treeherdercomm-central@95363809a3e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1393371
Bug 1393371 - Remove unused references to the nsIAtomService. r=jorgk
mailnews/base/util/nsMsgUtils.cpp
mailnews/imap/test/unit/test_imapFilterActions.js
mailnews/imap/test/unit/test_imapFilterActionsPostplugin.js
mailnews/test/resources/PromiseTestUtils.jsm
--- a/mailnews/base/util/nsMsgUtils.cpp
+++ b/mailnews/base/util/nsMsgUtils.cpp
@@ -58,17 +58,16 @@
 #include "nsArrayUtils.h"
 #include "nsIStringBundle.h"
 #include "nsIMsgWindow.h"
 #include "nsIWindowWatcher.h"
 #include "nsIPrompt.h"
 #include "nsIArray.h"
 #include "nsIMsgSearchTerm.h"
 #include "nsTextFormatter.h"
-#include "nsIAtomService.h"
 #include "nsIStreamListener.h"
 #include "nsReadLine.h"
 #include "nsICharsetDetectionObserver.h"
 #include "nsICharsetDetector.h"
 #include "nsILineInputStream.h"
 #include "nsIPlatformCharset.h"
 #include "nsIParserUtils.h"
 #include "nsICharsetConverterManager.h"
--- a/mailnews/imap/test/unit/test_imapFilterActions.js
+++ b/mailnews/imap/test/unit/test_imapFilterActions.js
@@ -41,22 +41,16 @@ var gMessageSubject = "Hello, did you re
 
 // a string in the body of the test message
 var gMessageInBody = "an HTML message";
 
 // various object references
 var gCopyService = MailServices.copy;
 var gDbService = Components.classes["@mozilla.org/msgDatabase/msgDBService;1"]
                              .getService(Components.interfaces.nsIMsgDBService);
-var kFiltersAppliedAtom = Cc["@mozilla.org/atom-service;1"]
-                              .getService(Ci.nsIAtomService)
-                              .getAtom("FiltersApplied");
-var kDeleteOrMoveMsgCompleted = Cc["@mozilla.org/atom-service;1"]
-                                    .getService(Ci.nsIAtomService)
-                                    .getAtom("DeleteOrMoveMsgCompleted");
 
 // Definition of tests. The test function name is the filter action
 // being tested, with "Body" appended to tests that use delayed
 // application of filters due to a body search
 var gTestArray =
 [ 
   setupIMAPPump,
     // optionally set server parameters, here enabling debug messages
--- a/mailnews/imap/test/unit/test_imapFilterActionsPostplugin.js
+++ b/mailnews/imap/test/unit/test_imapFilterActionsPostplugin.js
@@ -35,19 +35,16 @@ var gMessage = "draft1"; // message file
 var gMessageSubject = "Hello, did you receive my bugmail?";
 
 // a string in the body of the test message
 var gMessageInBody = "an HTML message";
 
 // various object references
 var gDbService = Components.classes["@mozilla.org/msgDatabase/msgDBService;1"]
                              .getService(Components.interfaces.nsIMsgDBService);
-var kDeleteOrMoveMsgCompleted = Cc["@mozilla.org/atom-service;1"]
-                                    .getService(Ci.nsIAtomService)
-                                    .getAtom("DeleteOrMoveMsgCompleted");
 
 // Definition of tests. The test function name is the filter action
 // being tested, with "Body" appended to tests that use delayed
 // application of filters due to a body search
 var gTestArray =
 [
   setupIMAPPump,
   setupFilters,
--- a/mailnews/test/resources/PromiseTestUtils.jsm
+++ b/mailnews/test/resources/PromiseTestUtils.jsm
@@ -159,19 +159,16 @@ PromiseTestUtils.PromiseStreamListener.p
  * @param event    string event name to listen for. Example event is
  *                 "DeleteOrMoveMsgCompleted".
  * @return         promise that resolves when the event occurs
  */
 
 var nsIMFNService = Ci.nsIMsgFolderNotificationService;
 PromiseTestUtils.promiseFolderEvent = function promiseFolderEvent(folder, event) {
   return new Promise( (resolve, reject) => {
-    let eventAtom = Cc["@mozilla.org/atom-service;1"]
-                      .getService(Ci.nsIAtomService)
-                      .getAtom(event);
     let folderListener = {
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIFolderListener]),
       OnItemEvent: function onItemEvent(aEventFolder, aEvent) {
         if (folder === aEventFolder &&
             event == aEvent) {
           MailServices.mailSession.RemoveFolderListener(folderListener);
           resolve();
         }