Cleanup moz-decl-counter usage and fix NS_LOG_ADDREF usage

docshell/base/nsWebShell.cpp

@@ -607,12 +607,9 @@ nsresult nsWebShell::DestroyPluginHost(void)
 
 //----------------------------------------------------------------------
 
-MOZ_DECL_CTOR_COUNTER(nsWebShell);
-
 // Note: operator new zeros our memory
 nsWebShell::nsWebShell()
 {
-  MOZ_COUNT_CTOR(nsWebShell);
 #ifdef DETECT_WEBSHELL_LEAKS
   // We're counting the number of |nsWebShells| to help find leaks
   ++gNumberOfWebShells;
@@ -647,7 +644,6 @@ nsWebShell::nsWebShell()
 
 nsWebShell::~nsWebShell()
 {
-  MOZ_COUNT_DTOR(nsWebShell);
   if (nsnull != mHistoryService) {
     nsServiceManager::ReleaseService(kGlobalHistoryCID, mHistoryService);
     mHistoryService = nsnull;