From 817713dd9b15a7b5eeb0eeec62953aa7bc43ad7a Mon Sep 17 00:00:00 2001 From: "jaggernaut%netscape.com" Date: Fri, 15 Sep 2006 09:51:39 +0000 Subject: [PATCH] Bug 86734: Remove NS_WITH_SERVICE. r=dbaron, rs=scc, a=asa git-svn-id: svn://10.0.0.236/trunk@211784 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsAboutRedirector.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/docshell/base/nsAboutRedirector.cpp b/mozilla/docshell/base/nsAboutRedirector.cpp index 85dff521f44..b0d2a915d68 100644 --- a/mozilla/docshell/base/nsAboutRedirector.cpp +++ b/mozilla/docshell/base/nsAboutRedirector.cpp @@ -50,7 +50,7 @@ nsAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) nsXPIDLCString path; (void)aURI->GetPath(getter_Copies(path)); nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; @@ -66,8 +66,8 @@ nsAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) if (NS_SUCCEEDED(rv) && result && !PL_strncasecmp(kRedirMap[i][1], kChromePrefix, sizeof(kChromePrefix)-1)) { - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv;