Bug 1368994 - Remove !compMgr warning. r=froydnj
authorEric Rahm <erahm@mozilla.com>
Wed, 26 Jul 2017 14:00:10 -0700
changeset 420049 0a667bf8c1a72692512122bedb41be805a4a19f1
parent 420048 aa4bd3b77a1739f00a00043ee5e90245031a5ef0
child 420050 4b6f93546febd2351711377bf21c4f8c8ba9ce7f
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1368994
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1368994 - Remove !compMgr warning. r=froydnj
xpcom/components/nsComponentManagerUtils.cpp
--- a/xpcom/components/nsComponentManagerUtils.cpp
+++ b/xpcom/components/nsComponentManagerUtils.cpp
@@ -44,28 +44,28 @@ CallGetService(const char* aContractID, 
 #else
 
 #include "nsComponentManager.h"
 
 nsresult
 CallGetService(const nsCID& aCID, const nsIID& aIID, void** aResult)
 {
   nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
-  if (NS_WARN_IF(!compMgr)) {
+  if (!compMgr) {
     return NS_ERROR_NOT_INITIALIZED;
   }
 
   return compMgr->nsComponentManagerImpl::GetService(aCID, aIID, aResult);
 }
 
 nsresult
 CallGetService(const char* aContractID, const nsIID& aIID, void** aResult)
 {
   nsComponentManagerImpl* compMgr = nsComponentManagerImpl::gComponentManager;
-  if (NS_WARN_IF(!compMgr)) {
+  if (!compMgr) {
     return NS_ERROR_NOT_INITIALIZED;
   }
 
   return compMgr->nsComponentManagerImpl::GetServiceByContractID(aContractID,
                                                                  aIID,
                                                                  aResult);
 }