Fixing thread-safety assertions. a=jar,r=valeski

intl/locale/src/mac/nsLocaleFactoryMac.cpp

@@ -49,32 +49,7 @@ nsLocaleMacFactory::~nsLocaleMacFactory()
 {   
 }   
 
-nsresult nsLocaleMacFactory::QueryInterface(const nsIID &aIID,   
-                                      void **aResult)   
-{   
-  if (aResult == NULL) {   
-    return NS_ERROR_NULL_POINTER;   
-  }   
-
-  // Always NULL result, in case of failure   
-  *aResult = NULL;   
-
-  if (aIID.Equals(kISupportsIID)) {   
-    *aResult = (void *)(nsISupports*)this;   
-  } else if (aIID.Equals(kIFactoryIID)) {   
-    *aResult = (void *)(nsIFactory*)this;   
-  }   
-
-  if (*aResult == NULL) {   
-    return NS_NOINTERFACE;   
-  }   
-
-  NS_ADDREF_THIS(); // Increase reference count for caller   
-  return NS_OK;   
-}   
-
-NS_IMPL_ADDREF(nsLocaleMacFactory);
-NS_IMPL_RELEASE(nsLocaleMacFactory);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleMacFactory, nsIFactory)
 
 nsresult nsLocaleMacFactory::CreateInstance(nsISupports *aOuter,  
                                          const nsIID &aIID,  

intl/locale/src/os2/nsLocaleFactoryOS2.cpp

@@ -195,37 +195,10 @@ nsLocaleFactoryOS2::CreateInstance(nsISupports* aOuter, REFNSIID aIID,
   return ret;
 }
 
-nsresult nsLocaleFactoryOS2::QueryInterface(const nsIID &aIID,   
-					    void **aResult)   
-{   
-  if (aResult == NULL) {   
-    return NS_ERROR_NULL_POINTER;   
-  }   
-
-  // Always NULL result, in case of failure   
-  *aResult = NULL;   
-
-  if (aIID.Equals(kISupportsIID)) {   
-    *aResult = (void *)(nsISupports*)this;   
-  }
-  else if (aIID.Equals(kIFactoryIID)) {   
-    *aResult = (void *)(nsIFactory*)this;   
-  }   
-
-  if (*aResult == NULL) {   
-    return NS_NOINTERFACE;   
-  }   
-
-  NS_ADDREF_THIS(); // Increase reference count for caller   
-  return NS_OK;   
-}   
-
-
 NS_IMETHODIMP
 nsLocaleFactoryOS2::LockFactory(PRBool	aBool)
 {
 	return NS_OK;
 }
 
-NS_IMPL_ADDREF(nsLocaleFactoryOS2);
-NS_IMPL_RELEASE(nsLocaleFactoryOS2);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleFactoryOS2, nsIFactory)

intl/locale/src/unix/nsLocaleFactoryUnix.cpp

@@ -49,7 +49,7 @@ nsLocaleUnixFactory::~nsLocaleUnixFactory()
 {   
 }   
 
-NS_IMPL_ISUPPORTS(nsLocaleUnixFactory, NS_GET_IID(nsIFactory));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleUnixFactory, nsIFactory)
 
 nsresult nsLocaleUnixFactory::CreateInstance(nsISupports *aOuter,  
                                          const nsIID &aIID,  

intl/locale/src/windows/nsLocaleFactoryWin.cpp

@@ -49,32 +49,7 @@ nsLocaleWinFactory::~nsLocaleWinFactory()
 {   
 }   
 
-nsresult nsLocaleWinFactory::QueryInterface(const nsIID &aIID,   
-                                      void **aResult)   
-{   
-  if (aResult == NULL) {   
-    return NS_ERROR_NULL_POINTER;   
-  }   
-
-  // Always NULL result, in case of failure   
-  *aResult = NULL;   
-
-  if (aIID.Equals(kISupportsIID)) {   
-    *aResult = (void *)(nsISupports*)this;   
-  } else if (aIID.Equals(kIFactoryIID)) {   
-    *aResult = (void *)(nsIFactory*)this;   
-  }   
-
-  if (*aResult == NULL) {   
-    return NS_NOINTERFACE;   
-  }   
-
-  NS_ADDREF_THIS(); // Increase reference count for caller   
-  return NS_OK;   
-}   
-
-NS_IMPL_ADDREF(nsLocaleWinFactory);
-NS_IMPL_RELEASE(nsLocaleWinFactory);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleWinFactory, nsIFactory)
 
 nsresult nsLocaleWinFactory::CreateInstance(nsISupports *aOuter,  
                                          const nsIID &aIID,