Bug 575197 - Apply the needed NS_NEWXPCOM/NS_DELETEXPCOM changes from Bug 562387 to Comm-Central's directory/. r=Neil

directory/xpcom/base/src/nsLDAPBERElement.cpp

@@ -119,8 +119,7 @@ NS_IMETHODIMP nsLDAPBERElement::PutSet(PRUint32 *aBytesWritten)
 NS_IMETHODIMP nsLDAPBERElement::GetAsValue(nsILDAPBERValue **_retval)
 {
   // create the value object
-  nsCOMPtr<nsILDAPBERValue> berValue;
-  NS_NEWXPCOM(berValue, nsLDAPBERValue);
+  nsCOMPtr<nsILDAPBERValue> berValue = new nsLDAPBERValue();
 
   if (!berValue) {
     NS_ERROR("nsLDAPBERElement::GetAsValue(): out of memory"

directory/xpcom/base/src/nsLDAPConnection.cpp

@@ -132,11 +132,11 @@ nsLDAPConnection::Release(void)
 
             NS_ADDREF(runnable);
             PR_Lock(runnable->mLock);
-            NS_DELETEXPCOM(this);
+            delete this;
             PR_Unlock(runnable->mLock);
             NS_RELEASE(runnable);
         } else {
-            NS_DELETEXPCOM(this);
+            delete this;
         }
 
         return 0;
@@ -706,8 +706,8 @@ CheckLDAPOperationResult(nsHashKey *aKey, void *aData, void* aClosure)
             // we want nsLDAPMessage specifically, not a compatible, since
             // we're sharing native objects used by the LDAP C SDK
             //
-            nsLDAPMessage *rawMsg;
-            NS_NEWXPCOM(rawMsg, nsLDAPMessage);
+            nsLDAPMessage *rawMsg = new nsLDAPMessage();
+
             if (!rawMsg) {
             NS_ERROR("CheckLDAPOperationResult(): couldn't allocate memory"
                      " for new LDAP message; search entry dropped");

directory/xpcom/base/src/nsLDAPMessage.cpp

@@ -611,12 +611,11 @@ nsLDAPMessage::GetBinaryValues(const char *aAttr, PRUint32 *aCount,
     //
     PRUint32 i;
     nsresult rv;
-    nsCOMPtr<nsILDAPBERValue> berValue;
     for ( i = 0 ; i < numVals ; i++ ) {
 
         // create an nsBERValue object
         //
-        NS_NEWXPCOM(berValue, nsLDAPBERValue);
+        nsCOMPtr<nsILDAPBERValue> berValue = new nsLDAPBERValue();
         if (!berValue) {
             NS_ERROR("nsLDAPMessage::GetBinaryValues(): out of memory"
                      " creating nsLDAPBERValue object");

directory/xpcom/base/src/nsLDAPURL.cpp

@@ -442,8 +442,8 @@ NS_IMETHODIMP nsLDAPURL::Clone(nsIURI **aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
-  nsLDAPURL *clone;
-  NS_NEWXPCOM(clone, nsLDAPURL);
+  nsLDAPURL *clone = new nsLDAPURL();
+
   if (!clone)
     return NS_ERROR_OUT_OF_MEMORY;