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

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<nsIIOService> 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<nsIScriptSecurityManager> securityManager = 
+                           do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
                   if (NS_FAILED(rv))
                       return rv;