code cleanup, no bug.

mailnews/compose/src/nsMsgQuote.cpp

@@ -61,8 +61,6 @@
 #include "nsMsgMailNewsUrl.h"
 #include "nsXPIDLString.h"
 
-static NS_DEFINE_CID(kIStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
-
 NS_IMPL_THREADSAFE_ADDREF(nsMsgQuoteListener)
 NS_IMPL_THREADSAFE_RELEASE(nsMsgQuoteListener)
 
@@ -232,8 +230,8 @@ nsMsgQuote::QuoteMessage(const char *msgURI, PRBool quoteHeaders, nsIStreamListe
   nsCOMPtr<nsISupports> ctxt = do_QueryInterface(aURL);
 
   nsCOMPtr<nsIStreamConverterService> streamConverterService = 
-           do_GetService(kIStreamConverterServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
+           do_GetService("@mozilla.org/streamConverters;1", &rv);
+  NS_ENSURE_SUCCESS(rv,rv);
 
   nsCOMPtr<nsIStreamListener> convertedListener;
   rv = streamConverterService->AsyncConvertData(NS_LITERAL_STRING("message/rfc822").get(),

mailnews/imap/src/nsImapProtocol.cpp

@@ -111,7 +111,6 @@ PRLogModuleInfo *IMAP;
 
 #define ONE_SECOND ((PRUint32)1000)    // one second
 
-static NS_DEFINE_CID(kIStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
 static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
@@ -8030,7 +8029,7 @@ nsresult nsImapMockChannel::SetupPartExtractorListener(nsIImapUrl * aUrl, nsIStr
   aUrl->GetMimePartSelectorDetected(&refersToPart);
   if (refersToPart)
   {
-    nsCOMPtr<nsIStreamConverterService> converter = do_GetService(kIStreamConverterServiceCID);
+    nsCOMPtr<nsIStreamConverterService> converter = do_GetService("@mozilla.org/streamConverters;1");
     if (converter && aConsumer)
     {
       nsCOMPtr<nsIStreamListener> newConsumer;