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

2001-07-25 07:54:28 +00:00
parent 7646cf33f8
commit c2bcad0b73
341 changed files with 1251 additions and 913 deletions
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1100,8 +1100,8 @@ nsImageFrame::TriggerLink(nsIPresContext* aPresContext,
      // Check that this page is allowed to load this URI.
      // Almost a copy of the similarly named method in nsGenericElement
      nsresult rv;
-      NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                      NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
+      nsCOMPtr<nsIScriptSecurityManager> securityManager = 
+               do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);

      nsCOMPtr<nsIPresShell> ps;
      if (NS_SUCCEEDED(rv))