Bug 514976 - Inline mailSessionContractID string/value.

r=neil sr=Standard8.

mail/base/content/mailCommands.js

@@ -449,9 +449,9 @@ function ViewPageSource(messages)
 
   try {
     // First, get the mail session
-    const mailSessionContractID = "@mozilla.org/messenger/services/session;1";
     const nsIMsgMailSession = Components.interfaces.nsIMsgMailSession;
-    var mailSession = Components.classes[mailSessionContractID].getService(nsIMsgMailSession);
+    var mailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
+                                .getService(nsIMsgMailSession);
     var mailCharacterSet = "charset=" + msgWindow.mailCharacterSet;
 
     for (var i = 0; i < numMessages; i++)

mailnews/base/search/content/FilterEditor.js

@@ -513,11 +513,11 @@ function SearchNewFolderOkCallback(name, uri)
     imapFolder = msgFolder.QueryInterface(Components.interfaces.nsIMsgImapMailFolder);
   }
   catch(ex) {}
-  var mailSessionContractID = "@mozilla.org/messenger/services/session;1";
   if (imapFolder) //imapFolder creation is asynchronous.
   {
     if (!gMailSession)
-      gMailSession = Components.classes[mailSessionContractID].getService(Components.interfaces.nsIMsgMailSession);
+      gMailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
+                               .getService(Components.interfaces.nsIMsgMailSession);
     try
     {
       var nsIFolderListener = Components.interfaces.nsIFolderListener;

mailnews/base/test/unit/test_nsMsgMailSession_Listeners.js

@@ -3,12 +3,11 @@
  * Test suite for nsMsgMailSession functions relating to listeners.
  */
 
-const mailSessionContractID = "@mozilla.org/messenger/services/session;1";
 const nsIMsgMailSession = Components.interfaces.nsIMsgMailSession;
 const nsIFolderListener = Components.interfaces.nsIFolderListener;
 const numListenerFunctions = 8;
 
-var gMailSession = Components.classes[mailSessionContractID]
+var gMailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
                              .getService(nsIMsgMailSession);
 var gMailSessionNotifier = gMailSession.QueryInterface(nsIFolderListener);
 

suite/mailnews/commandglue.js

@@ -1007,7 +1007,8 @@ function setupXFVirtualFolderSearch(folderUrisToSearch, searchTerms, searchOnlin
 
     gSearchSession = Components.classes[searchSessionContractID].createInstance(Components.interfaces.nsIMsgSearchSession);
 
-    gMailSession = Components.classes[mailSessionContractID].getService(Components.interfaces.nsIMsgMailSession);
+    gMailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
+                             .getService(Components.interfaces.nsIMsgMailSession);
 
   for (i in folderUrisToSearch)
     {

suite/mailnews/mailCommands.js

@@ -450,9 +450,9 @@ function ViewPageSource(messages)
 
     try {
         // First, get the mail session
-        const mailSessionContractID = "@mozilla.org/messenger/services/session;1";
         const nsIMsgMailSession = Components.interfaces.nsIMsgMailSession;
-        var mailSession = Components.classes[mailSessionContractID].getService(nsIMsgMailSession);
+        var mailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
+                                    .getService(nsIMsgMailSession);
 
         var mailCharacterSet = "charset=" + msgWindow.mailCharacterSet;
 

suite/mailnews/mailContextMenus.js

@@ -658,7 +658,7 @@ function CheckForMessageIdInFolder(folder, messageId)
 
   if (!gMailSession)
   {
-    gMailSession = Components.classes[mailSessionContractID]
+    gMailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
                              .getService(Components.interfaces.nsIMsgMailSession);
   }
 

suite/mailnews/mailWindow.js

@@ -42,7 +42,6 @@
  //This file stores variables common to mail windows
 var messengerContractID        = "@mozilla.org/messenger;1";
 var statusFeedbackContractID   = "@mozilla.org/messenger/statusfeedback;1";
-var mailSessionContractID      = "@mozilla.org/messenger/services/session;1";
 var secureUIContractID         = "@mozilla.org/secure_browser_ui;1";
 var msgWindowContractID      = "@mozilla.org/messenger/msgwindow;1";
 
@@ -96,7 +95,8 @@ function OnMailWindowUnload()
     dbview.close(); 
   }
 
-  var mailSession = Components.classes[mailSessionContractID].getService();
+  var mailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
+                              .getService();
   if (mailSession instanceof Components.interfaces.nsIMsgMailSession)
     mailSession.RemoveFolderListener(folderListener);
   mailSession.RemoveMsgWindow(msgWindow);

suite/mailnews/msgMail3PaneWindow.js

@@ -958,7 +958,7 @@ function loadStartFolder(initialUri)
 function AddToSession()
 {
   try {
-    var mailSession = Components.classes[mailSessionContractID]
+    var mailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
                                 .getService(Components.interfaces.nsIMsgMailSession);
     var nsIFolderListener = Components.interfaces.nsIFolderListener;
     var notifyFlags = nsIFolderListener.intPropertyChanged | nsIFolderListener.event;