Bug 337917 Make consumers stop using cids from other modules

r=darin sr=darin

mailnews/compose/src/nsMsgSendLater.cpp

@@ -72,8 +72,6 @@
 #include "nsIMimeConverter.h"
 #include "nsMsgMimeCID.h"
 
-static NS_DEFINE_CID(kISupportsArrayCID, NS_SUPPORTSARRAY_CID);
-
 NS_IMPL_ISUPPORTS2(nsMsgSendLater, nsIMsgSendLater, nsIStreamListener)
 
 nsMsgSendLater::nsMsgSendLater()
@@ -769,7 +767,7 @@ nsresult
 nsMsgSendLater::DeleteCurrentMessage()
 {
   // Get the composition fields interface
-  nsCOMPtr<nsISupportsArray> msgArray = do_CreateInstance(kISupportsArrayCID);
+  nsCOMPtr<nsISupportsArray> msgArray = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
   if (!msgArray)
     return NS_ERROR_FACTORY_NOT_LOADED;
 

mailnews/import/src/nsImportAddressBooks.cpp

@@ -72,11 +72,6 @@
 #include "ImportDebug.h"
 
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_STRING_CID);
-
-
-////////////////////////////////////////////////////////////////////////
-
 PR_STATIC_CALLBACK( void) ImportAddressThread( void *stuff);
 
 
@@ -299,7 +294,7 @@ NS_IMETHODIMP nsImportGenericAddressBooks::GetData(const char *dataId, nsISuppor
 		}
 		IMPORT_LOG1( "Requesting sample data #: %ld\n", (long)rNum);
 		if (m_pInterface) {
-			nsCOMPtr<nsISupportsString>	data = do_CreateInstance( kSupportsWStringCID, &rv);
+			nsCOMPtr<nsISupportsString>	data = do_CreateInstance( NS_SUPPORTS_STRING_CONTRACTID, &rv);
 			if (NS_FAILED( rv))
 				return( rv);
 			PRUnichar *	pData = nsnull;

mailnews/import/src/nsImportMail.cpp

@@ -78,8 +78,6 @@
 
 #define IMPORT_MSGS_URL       "chrome://messenger/locale/importMsgs.properties"
 
-static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_STRING_CID);
-
 ////////////////////////////////////////////////////////////////////////
 
 PR_STATIC_CALLBACK( void) ImportMailThread( void *stuff);
@@ -283,7 +281,7 @@ NS_IMETHODIMP nsImportGenericMail::GetData(const char *dataId, nsISupports **_re
 	if (!nsCRT::strcasecmp( dataId, "currentMailbox")) {
 		// create an nsISupportsString, get the current mailbox
 		// name being imported and put it in the string
-		nsCOMPtr<nsISupportsString>	data = do_CreateInstance( kSupportsWStringCID, &rv);
+		nsCOMPtr<nsISupportsString>	data = do_CreateInstance( NS_SUPPORTS_STRING_CONTRACTID, &rv);
 		if (NS_FAILED( rv))
 			return( rv);
 		if (m_pThreadData) {

xpinstall/src/nsInstallExecute.cpp

@@ -52,8 +52,6 @@
 #include "nsProcess.h"
 #include "nsReadableUtils.h"
 
-static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); 
-
 // Chop the command-line up in place into an array of arguments
 //   by replacing spaces in the command-line string with null
 //   terminators and pointing the array elements to the 
@@ -200,7 +198,7 @@ PRInt32 nsInstallExecute::Complete()
    if (mExecutableFile == nsnull)
       return nsInstall::INVALID_ARGUMENTS;
 
-   nsCOMPtr<nsIProcess> process = do_CreateInstance(kIProcessCID);
+   nsCOMPtr<nsIProcess> process = do_CreateInstance(NS_PROCESS_CONTRACTID);
 
    char *arguments = nsnull;
    if (!mArgs.IsEmpty())

xpinstall/src/nsInstallFileOpItem.cpp

@@ -59,8 +59,6 @@
 #include "nsILocalFileMac.h"
 #endif
 
-static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); 
-
 /* Public Methods */
 
 nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
@@ -967,7 +965,7 @@ nsInstallFileOpItem::NativeFileOpFileExecuteComplete()
   if (mTarget == nsnull)
     return nsInstall::INVALID_ARGUMENTS;
 
-  nsCOMPtr<nsIProcess> process = do_CreateInstance(kIProcessCID);
+  nsCOMPtr<nsIProcess> process = do_CreateInstance(NS_PROCESS_CONTRACTID);
   
   if (!mParams.IsEmpty())
   {

xpinstall/src/nsSoftwareUpdate.cpp

@@ -88,10 +88,6 @@ extern "C" void RunChromeInstallOnThread(void *data);
 // Globals
 ////////////////////////////////////////////////////////////////////////////////
 
-
-
-static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID);
-
 nsSoftwareUpdate* nsSoftwareUpdate::mInstance = nsnull;
 nsCOMPtr<nsIFile> nsSoftwareUpdate::mProgramDir = nsnull;
 char*             nsSoftwareUpdate::mLogName = nsnull;
@@ -219,7 +215,7 @@ nsSoftwareUpdate::Shutdown()
 
         //Create the Process framework
         pathToCleanupUtility->AppendNative(CLEANUP_UTIL);
-        nsCOMPtr<nsIProcess> cleanupProcess = do_CreateInstance(kIProcessCID);
+        nsCOMPtr<nsIProcess> cleanupProcess = do_CreateInstance(NS_PROCESS_CONTRACTID);
         rv = cleanupProcess->Init(pathToCleanupUtility);
         if (NS_SUCCEEDED(rv))
         {