From a7b443c4d3b880e6ecd328f0533df867052e70d3 Mon Sep 17 00:00:00 2001
From: Joshua Cranmer <Pidgeot18@gmail.com>
Date: Thu, 18 Jul 2013 21:21:19 -0500
Subject: [PATCH] Bug 884061 - Part 3e: Use NS_DECL_THREADSAFE_ISUPPORTS in
 docshell/, r=bz

--HG--
extra : rebase_source : dbc05e56fa9eb1ef273f40bd3278ccdea818df9a
---
 docshell/base/nsDSURIContentListener.cpp | 4 ++--
 docshell/base/nsDSURIContentListener.h   | 2 +-
 docshell/base/nsDocShell.cpp             | 6 +++---
 docshell/base/nsDocShell.h               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURIContentListener.cpp
index 036a64a255d6..819901c84dad 100644
--- a/docshell/base/nsDSURIContentListener.cpp
+++ b/docshell/base/nsDSURIContentListener.cpp
@@ -52,8 +52,8 @@ nsDSURIContentListener::Init()
 // nsDSURIContentListener::nsISupports
 //*****************************************************************************   
 
-NS_IMPL_THREADSAFE_ADDREF(nsDSURIContentListener)
-NS_IMPL_THREADSAFE_RELEASE(nsDSURIContentListener)
+NS_IMPL_ADDREF(nsDSURIContentListener)
+NS_IMPL_RELEASE(nsDSURIContentListener)
 
 NS_INTERFACE_MAP_BEGIN(nsDSURIContentListener)
     NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURIContentListener)
diff --git a/docshell/base/nsDSURIContentListener.h b/docshell/base/nsDSURIContentListener.h
index 1c17a793f363..69e227f420c1 100644
--- a/docshell/base/nsDSURIContentListener.h
+++ b/docshell/base/nsDSURIContentListener.h
@@ -23,7 +23,7 @@ class nsDSURIContentListener :
 {
 friend class nsDocShell;
 public:
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIURICONTENTLISTENER
 
     nsresult Init();
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 87e2660f1674..9e77056a6b5f 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11730,8 +11730,8 @@ nsRefreshTimer::~nsRefreshTimer()
 // nsRefreshTimer::nsISupports
 //*****************************************************************************   
 
-NS_IMPL_THREADSAFE_ADDREF(nsRefreshTimer)
-NS_IMPL_THREADSAFE_RELEASE(nsRefreshTimer)
+NS_IMPL_ADDREF(nsRefreshTimer)
+NS_IMPL_RELEASE(nsRefreshTimer)
 
 NS_INTERFACE_MAP_BEGIN(nsRefreshTimer)
     NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsITimerCallback)
@@ -11770,7 +11770,7 @@ nsDocShell::InterfaceRequestorProxy::~InterfaceRequestorProxy()
     mWeakPtr = nullptr;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsDocShell::InterfaceRequestorProxy, nsIInterfaceRequestor) 
+NS_IMPL_ISUPPORTS1(nsDocShell::InterfaceRequestorProxy, nsIInterfaceRequestor) 
   
 NS_IMETHODIMP 
 nsDocShell::InterfaceRequestorProxy::GetInterface(const nsIID & aIID, void **aSink)
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 59b01658e27f..454ec925afaa 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -109,7 +109,7 @@ class nsRefreshTimer : public nsITimerCallback
 public:
     nsRefreshTimer();
 
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSITIMERCALLBACK
 
     int32_t GetDelay() { return mDelay ;}
@@ -899,7 +899,7 @@ public:
     public:
         InterfaceRequestorProxy(nsIInterfaceRequestor* p);
         virtual ~InterfaceRequestorProxy();
-        NS_DECL_ISUPPORTS
+        NS_DECL_THREADSAFE_ISUPPORTS
         NS_DECL_NSIINTERFACEREQUESTOR
  
     protected: