Bug 1323406 - Port Bug 1323042 to mailnews: Remove calls to MOZ_COUNT_CTOR/DTOR from classes derived from nsISupports. rs=bustage-fix CLOSED TREE

db/mork/src/morkStore.cpp

@@ -128,7 +128,6 @@ morkStore::ClosePort(morkEnv* ev) // called by CloseMorkNode();
 /*public virtual*/
 morkStore::~morkStore() // assert CloseStore() executed earlier
 {
-  MOZ_COUNT_DTOR(morkStore);
   if (IsOpenNode())
     CloseMorkNode(mMorkEnv);
   MORK_ASSERT(this->IsShutNode());
@@ -178,7 +177,6 @@ morkStore::morkStore(morkEnv* ev, const morkUsage& inUsage,
 , mStore_CanDirty( morkBool_kFalse ) // not until the store is open
 , mStore_CanWriteIncremental( morkBool_kTrue ) // always with few exceptions
 {
-  MOZ_COUNT_CTOR(morkStore);
   if ( ev->Good() )
   {
     if ( inFactory && ioPortHeap )

mailnews/db/msgdb/src/nsMsgThread.cpp

@@ -14,12 +14,10 @@ NS_IMPL_ISUPPORTS(nsMsgThread, nsIMsgThread)
 
 nsMsgThread::nsMsgThread()
 {
-  MOZ_COUNT_CTOR(nsMsgThread);
   Init();
 }
 nsMsgThread::nsMsgThread(nsMsgDatabase *db, nsIMdbTable *table)
 {
-  MOZ_COUNT_CTOR(nsMsgThread);
   Init();
   m_mdbTable = table;
   m_mdbDB = db;
@@ -51,7 +49,6 @@ void nsMsgThread::Init()
 
 nsMsgThread::~nsMsgThread()
 {
-  MOZ_COUNT_DTOR(nsMsgThread);
   if (m_mdbDB)
   {
     mozilla::DebugOnly<bool> found = m_mdbDB->m_threads.RemoveElement(this);

mailnews/imap/src/nsImapMailFolder.cpp

@@ -197,8 +197,6 @@ nsImapMailFolder::nsImapMailFolder() :
     m_folderQuotaUsedKB(0),
     m_folderQuotaMaxKB(0)
 {
-  MOZ_COUNT_CTOR(nsImapMailFolder); // double count these for now.
-
   m_moveCoalescer = nullptr;
   m_boxFlags = 0;
   m_uidValidity = kUidUnknown;
@@ -216,8 +214,6 @@ nsImapMailFolder::nsImapMailFolder() :
 
 nsImapMailFolder::~nsImapMailFolder()
 {
-  MOZ_COUNT_DTOR(nsImapMailFolder);
-
   NS_IF_RELEASE(m_moveCoalescer);
   delete m_folderACL;
     

mailnews/news/src/nsNewsFolder.cpp

@@ -86,13 +86,11 @@ nsMsgNewsFolder::nsMsgNewsFolder(void) :
      m_downloadMessageForOfflineUse(false), m_downloadingMultipleMessages(false),
      mReadSet(nullptr), mSortOrder(kNewsSortOffset)
 {
-  MOZ_COUNT_CTOR(nsMsgNewsFolder); // double count these for now.
   mFolderSize = kSizeUnknown;
 }
 
 nsMsgNewsFolder::~nsMsgNewsFolder(void)
 {
-  MOZ_COUNT_DTOR(nsMsgNewsFolder);
   delete mReadSet;
 }