diff --git a/mozilla/extensions/datetime/nsDateTimeHandler.cpp b/mozilla/extensions/datetime/nsDateTimeHandler.cpp
index 25d4deb2fd6..dad291537f5 100644
--- a/mozilla/extensions/datetime/nsDateTimeHandler.cpp
+++ b/mozilla/extensions/datetime/nsDateTimeHandler.cpp
@@ -41,7 +41,7 @@ nsDateTimeHandler::nsDateTimeHandler() {
 nsDateTimeHandler::~nsDateTimeHandler() {
 }
 
-NS_IMPL_ISUPPORTS(nsDateTimeHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsDateTimeHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsDateTimeHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
diff --git a/mozilla/extensions/finger/nsFingerHandler.cpp b/mozilla/extensions/finger/nsFingerHandler.cpp
index ad0d216c1bf..60d8f97389d 100644
--- a/mozilla/extensions/finger/nsFingerHandler.cpp
+++ b/mozilla/extensions/finger/nsFingerHandler.cpp
@@ -41,7 +41,7 @@ nsFingerHandler::nsFingerHandler() {
 nsFingerHandler::~nsFingerHandler() {
 }
 
-NS_IMPL_ISUPPORTS(nsFingerHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsFingerHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsFingerHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
diff --git a/mozilla/netwerk/base/src/nsAuthURLParser.cpp b/mozilla/netwerk/base/src/nsAuthURLParser.cpp
index 8e662d33fa0..34fd34eb7c3 100644
--- a/mozilla/netwerk/base/src/nsAuthURLParser.cpp
+++ b/mozilla/netwerk/base/src/nsAuthURLParser.cpp
@@ -24,7 +24,7 @@
 #include "prprf.h"
 #include "prnetdb.h" // IPv6 support
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsAuthURLParser, NS_GET_IID(nsIURLParser))
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsAuthURLParser, nsIURLParser)
 
 nsAuthURLParser::~nsAuthURLParser()
 {
diff --git a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
index c59b6dde689..aca606ec91e 100644
--- a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
+++ b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
@@ -37,7 +37,7 @@ static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 //////////////////////////////
 //// nsISupports
 //////////////////////////////
-NS_IMPL_THREADSAFE_ISUPPORTS(nsNetModRegEntry, NS_GET_IID(nsINetModRegEntry));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModRegEntry, nsINetModRegEntry);
 
 
 //////////////////////////////
diff --git a/mozilla/netwerk/base/src/nsNetModuleMgr.cpp b/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
index 5b414ecab1e..7f4b64fc5db 100644
--- a/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
+++ b/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
@@ -34,7 +34,7 @@ nsNetModuleMgr* nsNetModuleMgr::gManager;
 //// nsISupports
 ///////////////////////////////////
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsNetModuleMgr, NS_GET_IID(nsINetModuleMgr));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModuleMgr, nsINetModuleMgr);
 
 
 ///////////////////////////////////
diff --git a/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp b/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp
index d5b0e4eea79..11c10c39e46 100644
--- a/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp
+++ b/mozilla/netwerk/base/src/nsNoAuthURLParser.cpp
@@ -24,7 +24,7 @@
 #include "prprf.h"
 #include "prnetdb.h"
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsNoAuthURLParser, NS_GET_IID(nsIURLParser))
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsNoAuthURLParser, nsIURLParser)
 
 nsNoAuthURLParser::~nsNoAuthURLParser()
 {
diff --git a/mozilla/netwerk/cache/filecache/nsDBAccessor.cpp b/mozilla/netwerk/cache/filecache/nsDBAccessor.cpp
index 1b4a6ed793d..a7103bd69de 100644
--- a/mozilla/netwerk/cache/filecache/nsDBAccessor.cpp
+++ b/mozilla/netwerk/cache/filecache/nsDBAccessor.cpp
@@ -62,7 +62,7 @@ nsDBAccessor::~nsDBAccessor()
 //
 // Implement nsISupports methods
 //
-NS_IMPL_THREADSAFE_ISUPPORTS(nsDBAccessor, NS_GET_IID(nsIDBAccessor))
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsDBAccessor, nsIDBAccessor)
 
 
 ///////////////////////////////////////////////////////////
diff --git a/mozilla/netwerk/cache/filecache/nsDBEnumerator.cpp b/mozilla/netwerk/cache/filecache/nsDBEnumerator.cpp
index 1997698b050..f828e2c8f7b 100644
--- a/mozilla/netwerk/cache/filecache/nsDBEnumerator.cpp
+++ b/mozilla/netwerk/cache/filecache/nsDBEnumerator.cpp
@@ -51,7 +51,7 @@ nsDBEnumerator::~nsDBEnumerator()
 //
 // Implement nsISupports methods
 //
-NS_IMPL_ISUPPORTS(nsDBEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsDBEnumerator, nsISimpleEnumerator)
 
 /////////////////////////////////////////////////////////////////
 // nsISimpleEnumerator methods
diff --git a/mozilla/netwerk/cache/filecache/nsDiskCacheRecord.cpp b/mozilla/netwerk/cache/filecache/nsDiskCacheRecord.cpp
index 7857b97eda9..7cd893ac84d 100644
--- a/mozilla/netwerk/cache/filecache/nsDiskCacheRecord.cpp
+++ b/mozilla/netwerk/cache/filecache/nsDiskCacheRecord.cpp
@@ -134,7 +134,7 @@ nsDiskCacheRecord::~nsDiskCacheRecord()
 //
 // Implement nsISupports methods
 //
-NS_IMPL_THREADSAFE_ISUPPORTS(nsDiskCacheRecord, NS_GET_IID(nsINetDataCacheRecord))
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsDiskCacheRecord, nsINetDataCacheRecord)
 
 ///////////////////////////////////////////////////////////////////////
 // nsINetDataCacheRecord methods
diff --git a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp
index 0c347654060..419fb8e3ee0 100644
--- a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp
+++ b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp
@@ -64,7 +64,7 @@ class WriteStreamWrapper : public nsIOutputStream
 };
 
 // implement nsISupports
-NS_IMPL_THREADSAFE_ISUPPORTS(WriteStreamWrapper, NS_GET_IID(nsIOutputStream))
+NS_IMPL_THREADSAFE_ISUPPORTS1(WriteStreamWrapper, nsIOutputStream)
 
 WriteStreamWrapper::WriteStreamWrapper(nsDiskCacheRecordChannel* aChannel, 
                                        nsIOutputStream *aBaseStream) 
diff --git a/mozilla/netwerk/cache/memcache/nsMemCache.cpp b/mozilla/netwerk/cache/memcache/nsMemCache.cpp
index d20d795cbb0..7589b3ae65a 100644
--- a/mozilla/netwerk/cache/memcache/nsMemCache.cpp
+++ b/mozilla/netwerk/cache/memcache/nsMemCache.cpp
@@ -66,7 +66,7 @@ nsMemCache::Init()
     return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS(nsMemCache, NS_GET_IID(nsINetDataCache))
+NS_IMPL_ISUPPORTS1(nsMemCache, nsINetDataCache)
 
 NS_IMETHODIMP
 nsMemCache::GetDescription(PRUnichar * *aDescription)
diff --git a/mozilla/netwerk/cache/mgr/nsCacheManager.cpp b/mozilla/netwerk/cache/mgr/nsCacheManager.cpp
index f584cb36b60..00244046c5a 100644
--- a/mozilla/netwerk/cache/mgr/nsCacheManager.cpp
+++ b/mozilla/netwerk/cache/mgr/nsCacheManager.cpp
@@ -450,7 +450,7 @@ private:
     nsCOMPtr<nsINetDataCache> mCache;
 };
 
-NS_IMPL_ISUPPORTS(CacheEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(CacheEnumerator, nsISimpleEnumerator)
 
 NS_IMETHODIMP
 nsCacheManager::NewCacheModuleIterator(nsISimpleEnumerator* *aResult)
diff --git a/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp b/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp
index b66162031a4..7242acfb26c 100644
--- a/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp
+++ b/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp
@@ -28,7 +28,7 @@
 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 
-NS_IMPL_ISUPPORTS(mzAboutMozilla, NS_GET_IID(nsIAboutModule));
+NS_IMPL_ISUPPORTS1(mzAboutMozilla, nsIAboutModule)
 
 static const char kCreditsPage[] = "chrome://global/content/mozilla.html";
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
index b59574aebd6..a393d8058a5 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
@@ -28,7 +28,7 @@
 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 
-NS_IMPL_ISUPPORTS(nsAboutBlank, NS_GET_IID(nsIAboutModule));
+NS_IMPL_ISUPPORTS1(nsAboutBlank, nsIAboutModule);
 
 static const char kBlankPage[] = "";
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp
index 77e33dfd278..a9dfea978de 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp
@@ -40,7 +40,7 @@ static void GC_gcollect() {}
 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 
-NS_IMPL_ISUPPORTS(nsAboutBloat, NS_GET_IID(nsIAboutModule));
+NS_IMPL_ISUPPORTS1(nsAboutBloat, nsIAboutModule)
 
 NS_IMETHODIMP
 nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result)
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp
index ad35a87e97c..9e2265605c4 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp
@@ -36,7 +36,7 @@
 #include "nsINetDataCacheRecord.h"
 
 
-NS_IMPL_ISUPPORTS(nsAboutCache, NS_GET_IID(nsIAboutModule));
+NS_IMPL_ISUPPORTS1(nsAboutCache, nsIAboutModule)
 
 NS_IMETHODIMP
 nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result)
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp
index 16dfcfc3903..79badd1a5d5 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp
@@ -28,7 +28,7 @@
 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 
-NS_IMPL_ISUPPORTS(nsAboutCredits, NS_GET_IID(nsIAboutModule));
+NS_IMPL_ISUPPORTS1(nsAboutCredits, nsIAboutModule)
 
 static const char kCreditsPage[] = "http://www.mozilla.org/credits/";
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp b/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp
index d31d6242313..e4a275cb0d1 100755
--- a/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp
@@ -29,7 +29,7 @@
 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 
-NS_IMPL_ISUPPORTS(nsAboutPlugins, NS_GET_IID(nsIAboutModule));
+NS_IMPL_ISUPPORTS1(nsAboutPlugins, nsIAboutModule)
 
 static const char kPluginsPage[] = "chrome://global/content/plugins.html";
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
index 58817582e0f..a4987edf2dd 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
@@ -50,7 +50,7 @@ nsAboutProtocolHandler::~nsAboutProtocolHandler()
 {
 }
 
-NS_IMPL_ISUPPORTS(nsAboutProtocolHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsAboutProtocolHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsAboutProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
diff --git a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
index ea1bae26427..1b1e9a67b71 100644
--- a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
+++ b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
@@ -41,7 +41,7 @@ nsDataHandler::nsDataHandler() {
 nsDataHandler::~nsDataHandler() {
 }
 
-NS_IMPL_ISUPPORTS(nsDataHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsDataHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsDataHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp
index 25d4deb2fd6..dad291537f5 100644
--- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp
+++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeHandler.cpp
@@ -41,7 +41,7 @@ nsDateTimeHandler::nsDateTimeHandler() {
 nsDateTimeHandler::~nsDateTimeHandler() {
 }
 
-NS_IMPL_ISUPPORTS(nsDateTimeHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsDateTimeHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsDateTimeHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp
index ad0d216c1bf..60d8f97389d 100644
--- a/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp
+++ b/mozilla/netwerk/protocol/finger/src/nsFingerHandler.cpp
@@ -41,7 +41,7 @@ nsFingerHandler::nsFingerHandler() {
 nsFingerHandler::~nsFingerHandler() {
 }
 
-NS_IMPL_ISUPPORTS(nsFingerHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsFingerHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsFingerHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp
index 3734c76c25a..8190c521088 100644
--- a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp
@@ -40,7 +40,7 @@ nsHeaderEntry::~nsHeaderEntry()
 }
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsHeaderEntry, NS_GET_IID(nsIHTTPHeader))
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsHeaderEntry, nsIHTTPHeader)
 
 
 NS_IMETHODIMP
@@ -295,8 +295,8 @@ nsHTTPHeaderEnumerator::~nsHTTPHeaderEnumerator()
 //
 // Implement nsISupports methods
 //
-NS_IMPL_ISUPPORTS(nsHTTPHeaderEnumerator, 
-                  NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsHTTPHeaderEnumerator, 
+                   nsISimpleEnumerator)
 
 
 //
diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPResponse.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPResponse.cpp
index 78eb7e92d9a..d35e8ca0837 100644
--- a/mozilla/netwerk/protocol/http/src/nsHTTPResponse.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHTTPResponse.cpp
@@ -57,7 +57,7 @@ nsHTTPResponse::~nsHTTPResponse()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsHTTPResponse, NS_GET_IID(nsISupports))
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsHTTPResponse, nsISupports)
 
 nsresult nsHTTPResponse::GetCharset(char* *o_Charset)
 {
diff --git a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
index 51d5028818f..afc0bddfbf9 100644
--- a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
@@ -59,7 +59,7 @@ nsKeywordProtocolHandler::Init() {
 nsKeywordProtocolHandler::~nsKeywordProtocolHandler() {
 }
 
-NS_IMPL_ISUPPORTS(nsKeywordProtocolHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsKeywordProtocolHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsKeywordProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) {
diff --git a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
index 5ddfc9b3d6d..ff69d889292 100644
--- a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
+++ b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
@@ -70,7 +70,7 @@ nsSocketProviderService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResu
   return rv;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsSocketProviderService, NS_GET_IID(nsISocketProviderService));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsSocketProviderService, nsISocketProviderService);
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
index 9ab1380a878..4289f8346f8 100644
--- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
@@ -819,7 +819,7 @@ mozTXTToHTMLConv::~mozTXTToHTMLConv()
   MOZ_TIMER_PRINT(mGlyphHitTimer);
 }
 
-NS_IMPL_ISUPPORTS(mozTXTToHTMLConv, NS_GET_IID(mozTXTToHTMLConv));
+NS_IMPL_ISUPPORTS1(mozTXTToHTMLConv, mozTXTToHTMLConv)
 
 PRInt32
 mozTXTToHTMLConv::CiteLevelTXT(const PRUnichar *line,
diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
index 52c2f56c766..9fa4d0ae9d2 100644
--- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
+++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
@@ -48,7 +48,7 @@
 
 ////////////////////////////////////////////////////////////
 // nsISupports methods
-NS_IMPL_THREADSAFE_ISUPPORTS(nsStreamConverterService, NS_GET_IID(nsIStreamConverterService));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService);
 
 
 ////////////////////////////////////////////////////////////
diff --git a/mozilla/netwerk/streamconv/test/Converters.cpp b/mozilla/netwerk/streamconv/test/Converters.cpp
index 496bea7fe1d..a310aebea97 100644
--- a/mozilla/netwerk/streamconv/test/Converters.cpp
+++ b/mozilla/netwerk/streamconv/test/Converters.cpp
@@ -119,7 +119,7 @@ TestConverterFactory::~TestConverterFactory()
 {
 }
 
-NS_IMPL_ISUPPORTS(TestConverterFactory, NS_GET_IID(nsIFactory));
+NS_IMPL_ISUPPORTS1(TestConverterFactory, nsIFactory)
 
 NS_IMETHODIMP
 TestConverterFactory::CreateInstance(nsISupports *aOuter,
diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
index 92c20abb068..379d2034911 100644
--- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
+++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
@@ -114,7 +114,7 @@ public:
     }
 };
 
-NS_IMPL_ISUPPORTS(EndListener, NS_GET_IID(nsIStreamListener));
+NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener);
 ////////////////////////////////////////////////////////////////////////
 // EndListener END
 ////////////////////////////////////////////////////////////////////////