Backed out changeset: 8b5a38ba459a

xpcom/components/nsComponentManager.cpp

@@ -1298,7 +1298,7 @@ nsComponentManagerImpl::HashContractID(const char *aContractID,
     if(!aContractID || !aContractIDLen)
         return NS_ERROR_NULL_POINTER;
 
-    NS_ASSERTION(PR_GetMonitorEntryCount(mMon), "called from outside mMon");
+    nsAutoMonitor mon(mMon);
 
     nsContractIDTableEntry* contractIDTableEntry =
         static_cast<nsContractIDTableEntry*>

xpcom/components/nsComponentManager.h

@@ -213,9 +213,6 @@ public:
     nsFactoryEntry *GetFactoryEntry(const nsCID &aClass);
 
     nsresult SyncComponentsInDir(PRInt32 when, nsIFile *dirSpec);
-
-    // NOTE: HashContractID operates on the hash table with ContractIDs,
-    // for thread-safety it should only be invoked from inside mMon.
     nsresult HashContractID(const char *acontractID, PRUint32 aContractIDLen,
                             nsFactoryEntry *fe_ptr);