Bug 86734: Remove NS_WITH_SERVICE. r=dbaron, rs=scc, a=asa

git-svn-id: svn://10.0.0.236/trunk@99906 18797224-902f-48f8-a5cc-f745e15eee43
2001-07-25 07:54:28 +00:00
parent 5457c9aeca
commit 2b3b3b2586
477 changed files with 1976 additions and 1454 deletions
--- a/mozilla/extensions/python/xpcom/src/xpcom.cpp
+++ b/mozilla/extensions/python/xpcom/src/xpcom.cpp
@@ -355,10 +355,8 @@ PyXPCOMMethod_GetProxyForObject(PyObject *self, PyObject *args)
 	nsresult rv_proxy;
 	nsISupports *presult = nsnull;
 	Py_BEGIN_ALLOW_THREADS;
-	NS_WITH_SERVICE(nsIProxyObjectManager,
-		  proxyMgr, 
-		  kProxyObjectManagerCID,
-		  &rv_proxy);
+	nsCOMPtr<nsIProxyObjectManager> proxyMgr = 
+	         do_GetService(kProxyObjectManagerCID, &rv_proxy);

 	if ( NS_SUCCEEDED(rv_proxy) ) {
 		rv_proxy = proxyMgr->GetProxyForObject(pQueue,