r=dbaron, sr=dougt. 97667. nsIInterfaceRequestor is now frozen. nsIInterfaceRequestorUtils.h is now required if you want to use do_GetInterface() for convenience. The two were split because the stuff that is now in nsIInterfaceRequestorUtils.h wasn't ready for freezing. Also, .idl files should just contain interface defs anyway.

content/base/src/nsDocument.cpp

@@ -26,6 +26,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsDocument.h"
 #include "nsIArena.h"
 #include "nsIURL.h"
@@ -96,7 +97,6 @@
 #include "nsIAggregatePrincipal.h"
 #include "nsIPrivateDOMImplementation.h"
 
-#include "nsIInterfaceRequestor.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsPIDOMWindow.h"
 #include "nsIFocusController.h"

content/base/src/nsDocumentViewer.cpp

@@ -71,6 +71,7 @@
 #include "nsIContentViewerFile.h"
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeNode.h"
 #include "nsIDocShellTreeOwner.h"

content/events/src/nsDOMEvent.cpp

@@ -37,6 +37,7 @@
 #include "nsIScrollableView.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIDOMAbstractView.h"
 #include "prmem.h"

content/html/document/src/nsHTMLContentSink.cpp

@@ -25,6 +25,7 @@
 #include "nsXPIDLString.h"
 #include "nsIHTMLContentSink.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIParser.h"
 #include "nsParserUtils.h"
 #include "nsICSSStyleSheet.h"

content/xml/document/src/nsXMLDocument.h

@@ -27,6 +27,7 @@
 #include "nsIXMLDocument.h"
 #include "nsIHTMLContentContainer.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIHttpEventSink.h"
 
 class nsIParser;

directory/xpcom/base/src/nsLDAPChannel.h

@@ -44,6 +44,7 @@
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIStreamListener.h"
 #include "nsILDAPMessageListener.h"
 #include "nsIProgressEventSink.h"

docshell/base/nsDocShell.h

@@ -59,6 +59,7 @@
 #include "nsIDocCharset.h"
 #include "nsIGlobalHistory.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPrompt.h"
 #include "nsIRefreshURI.h"
 #include "nsIScriptGlobalObject.h"

docshell/base/nsWebShell.cpp

@@ -35,6 +35,7 @@ typedef unsigned long HMTX;
 #include "nsWebShell.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebProgress.h"
 #include "nsIDocumentLoader.h"
 #include "nsIDocumentLoaderFactory.h"

dom/src/base/nsDOMClassInfo.cpp

@@ -53,6 +53,7 @@
 #include "nsIScriptExternalNameSet.h"
 #include "nsJSUtils.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsScriptNameSpaceManager.h"
 #include "nsIScriptObjectOwner.h"
 #include "nsIJSNativeInitializer.h"

dom/src/base/nsDOMWindowList.cpp

@@ -35,6 +35,7 @@
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeNode.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"
 

dom/src/base/nsGlobalWindow.h

@@ -46,6 +46,7 @@
 #include "nsIDOMNSLocation.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDOMJSWindow.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptObjectPrincipal.h"

dom/src/base/nsJSEnvironment.cpp

@@ -50,6 +50,7 @@
 #include "nsIPresContext.h"
 #include "nsIScriptError.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPrompt.h"
 #include "nsIObserverService.h"
 #include "nsGUIEvent.h"

dom/src/jsurl/nsJSProtocolHandler.cpp

@@ -39,6 +39,7 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsICodebasePrincipal.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIByteArrayInputStream.h"
 #include "nsIWindowMediator.h"
 #include "nsIDOMWindowInternal.h"

editor/base/nsComposerController.h

@@ -30,6 +30,7 @@
 #include "nsIEditorController.h"
 #include "nsIController.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIControllerCommand.h"
 #include "nsWeakPtr.h"
 

editor/base/nsEditorController.h

@@ -31,6 +31,7 @@
 #include "nsIEditorController.h"
 #include "nsIControllerCommand.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsHashtable.h"
 #include "nsString.h"

editor/composer/src/nsComposerController.h

@@ -30,6 +30,7 @@
 #include "nsIEditorController.h"
 #include "nsIController.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIControllerCommand.h"
 #include "nsWeakPtr.h"
 

editor/composer/src/nsEditingSession.cp

@@ -46,6 +46,7 @@
 
 #include "nsIComponentManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #if DEBUG
 #define NOISY_DOC_LOADING   1

editor/libeditor/base/nsEditorController.h

@@ -31,6 +31,7 @@
 #include "nsIEditorController.h"
 #include "nsIControllerCommand.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsHashtable.h"
 #include "nsString.h"

embedding/browser/activex/src/control/StdAfx.h

@@ -75,6 +75,7 @@
 #include "nsIContentViewer.h"
 #include "nsIContentViewerEdit.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPresShell.h"
 #include "nsCOMPtr.h"
 #include "nsISelection.h"

embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp

@@ -25,6 +25,7 @@
 
 #include "nsIDOMWindowInternal.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocShell.h"
 #include "nsIMIMEInfo.h"
 #include "nsIURI.h"

embedding/browser/photon/src/stdhdrs.h

@@ -62,6 +62,7 @@
 #include "nsISearchContext.h"
 #include "nsIContentViewerEdit.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPresShell.h"
 #include "nsCOMPtr.h"
 #include "nsISelection.h"

embedding/browser/powerplant/source/CBrowserShell.cpp

@@ -34,6 +34,7 @@
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebProgressListener.h"
 #include "nsIServiceManager.h"
 #include "nsIClipboardCommands.h"

embedding/browser/powerplant/source/CWebBrowserChrome.h

@@ -33,6 +33,7 @@
 #include "nsIWebProgressListener.h"
 #include "nsIEmbeddingSiteWindow.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPrompt.h"
 #include "nsIContextMenuListener.h"
 #include "nsITooltipListener.h"

embedding/browser/webBrowser/nsDocShellTreeOwner.h

@@ -31,6 +31,7 @@
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsIDOMMouseListener.h"
 #include "nsIDOMDocument.h"

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -35,6 +35,7 @@
 #include "nsIDOMWindow.h"
 #include "nsIDOMElement.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsIWebShell.h"
 #include "nsPIDOMWindow.h"

embedding/browser/webBrowser/nsWebBrowser.h

@@ -35,6 +35,7 @@
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIScrollable.h"
 #include "nsISHistory.h"
 #include "nsITextScroll.h"

embedding/components/find/src/nsWebBrowserFind.cpp

@@ -29,6 +29,7 @@
 #include "nsTextServicesCID.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsPIDOMWindow.h"

embedding/qa/testembed/StdAfx.h

@@ -59,6 +59,7 @@
 #include "nsIWebProgress.h"
 #include "nsIWindowCreator.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIClipboardCommands.h"

embedding/tests/gtkEmbed/WebBrowserChrome.h

@@ -36,6 +36,7 @@
 #include "nsIWebNavigation.h"
 #include "nsIWebProgressListener.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPrompt.h"
 #include "nsIWebBrowser.h"
 #include "nsVoidArray.h"

embedding/tests/mfcembed/StdAfx.h

@@ -59,6 +59,7 @@
 #include "nsIWebProgress.h"
 #include "nsIWindowCreator.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIClipboardCommands.h"

embedding/tests/mfcembed/components/HelperAppDlg.cpp

@@ -34,6 +34,7 @@
 #include "nsIServiceManager.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 // This file contains code which overrides the default
 // Gecko implementation for helper app dialog handling

embedding/tests/winEmbed/WebBrowserChrome.cpp

@@ -30,6 +30,7 @@
 #include "nsIDOMWindow.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIRequest.h"
 #include "nsIChannel.h"
 #include "nsCWebBrowser.h"

embedding/tests/winEmbed/WebBrowserChrome.h

@@ -36,6 +36,7 @@
 #include "nsIWebNavigation.h"
 #include "nsIWebProgressListener.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebBrowser.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"

extensions/cookie/nsCookieHTTPNotify.cpp

@@ -38,6 +38,7 @@
 #include "nsICategoryManager.h"
 #include "nsIHttpProtocolHandler.h"		// for NS_HTTP_STARTUP_CATEGORY
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPrompt.h"
 
 static NS_DEFINE_CID(kINetModuleMgrCID, NS_NETMODULEMGR_CID);

extensions/datetime/nsDateTimeChannel.cpp

@@ -27,6 +27,7 @@
 #include "nsIServiceManager.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsXPIDLString.h"
 #include "nsISocketTransportService.h"
 #include "nsITransport.h"

extensions/datetime/nsDateTimeChannel.h

@@ -31,6 +31,7 @@
 #include "nsILoadGroup.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsCOMPtr.h"
 #include "nsXPIDLString.h"
 #include "nsIChannel.h"

extensions/datetime/nsDateTimeHandler.cpp

@@ -28,6 +28,7 @@
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIProgressEventSink.h"
 #include "nsNetCID.h"
 

extensions/finger/nsFingerChannel.cpp

@@ -26,6 +26,7 @@
 #include "nsIServiceManager.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsXPIDLString.h"
 #include "nsISocketTransportService.h"
 #include "nsIStringStream.h"

extensions/finger/nsFingerChannel.h

@@ -27,6 +27,7 @@
 #include "nsILoadGroup.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsCOMPtr.h"
 #include "nsXPIDLString.h"
 #include "nsIChannel.h"

extensions/finger/nsFingerHandler.cpp

@@ -28,6 +28,7 @@
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIProgressEventSink.h"
 #include "nsNetCID.h"
 

extensions/inspector/base/src/inBitmapChannel.cpp

@@ -24,6 +24,7 @@
 #include "inIBitmapURI.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsXPIDLString.h"
 #include "nsMemory.h"
 #include "nsIStringStream.h"

extensions/inspector/base/src/inBitmapChannel.h

@@ -28,6 +28,7 @@
 #include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIURI.h"
 
 class nsIFile;

extensions/p3p/src/nsP3PHTTPNotify.cpp

@@ -32,6 +32,7 @@
 #include "nsILoadGroup.h"
 
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocumentLoader.h"
 
 #include "nsString.h"

extensions/p3p/src/nsP3PUI.cpp

@@ -28,6 +28,7 @@
 #include "nsP3PLogging.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsIObserverService.h"
 #include "nsIDocumentLoader.h"

extensions/wallet/src/nsWalletService.cpp

@@ -42,6 +42,7 @@
 #include "nsIDocShell.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPrompt.h"
 #include "nsIChannel.h"
 #include "nsIWindowWatcher.h"

extensions/xmlextras/base/src/nsXMLHttpRequest.cpp

@@ -53,6 +53,7 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIEventQueueService.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #endif
 #include "nsIDOMClassInfo.h"
 #include "nsIDOMElement.h"

extensions/xmlterm/base/mozXMLTermUtils.cpp

@@ -27,6 +27,7 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsIContentViewer.h"
 #include "nsIDocumentViewer.h"

extensions/xmlterm/base/mozXMLTerminal.cpp

@@ -63,6 +63,7 @@
 
 #include "nsIWebNavigation.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebProgress.h"
 
 ////////////////////////////////////////////////////////////////////////

gfx/src/nsRenderingContextImpl.cpp

@@ -689,6 +689,7 @@ float         avx,avy,av1x,av1y;
 #include "imgIContainer.h"
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */
 NS_IMETHODIMP nsRenderingContextImpl::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint)

gfx/src/ps/nsRenderingContextPS.cpp

@@ -1271,6 +1271,7 @@ nsRenderingContextPS::DrawTile(nsIImage *aImage,nscoord aX0,nscoord aY0,nscoord
 #include "imgIContainer.h"
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */
 NS_IMETHODIMP nsRenderingContextPS::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint)

gfx/src/shared/gfxImageFrame.h

@@ -23,6 +23,7 @@
 
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsIImage.h"
 

gfx/src/shared/nsRenderingContextImpl.cpp

@@ -689,6 +689,7 @@ float         avx,avy,av1x,av1y;
 #include "imgIContainer.h"
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */
 NS_IMETHODIMP nsRenderingContextImpl::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint)

gfx/src/xlib/nsRenderingContextXlib.cpp

@@ -39,6 +39,7 @@
 #include "imgIContainer.h"
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #endif /* _IMPL_NS_XPRINT */
 
 #ifdef _IMPL_NS_XPRINT

gfx/src/xprint/nsRenderingContextXP.cpp

@@ -1465,6 +1465,7 @@ nsRenderingContextXp::DrawImage(nsIImage *aImage, const nsRect& aSRect, const ns
 #include "imgIContainer.h"
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 /* [noscript] void drawImage (in imgIContainer aImage, [const] in nsRect aSrcRect, [const] in nsPoint aDestPoint); */
 NS_IMETHODIMP nsRenderingContextXp::DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint)

gfx2/src/gfxImageFrame.h

@@ -23,6 +23,7 @@
 
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsIImage.h"
 

htmlparser/robot/nsDebugRobot.cpp

@@ -38,6 +38,7 @@
 #include "nsIComponentManager.h"
 #include "nsParserCIID.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 

layout/base/nsDocumentViewer.cpp

@@ -71,6 +71,7 @@
 #include "nsIContentViewerFile.h"
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeNode.h"
 #include "nsIDocShellTreeOwner.h"

layout/base/nsPresContext.cpp

@@ -41,6 +41,7 @@
 #include "nsIComponentManager.h"
 #include "nsIURIContentListener.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIServiceManager.h"
 #include "nsBoxLayoutState.h"
 #include "nsIBox.h"

layout/base/src/nsPresContext.cpp

@@ -41,6 +41,7 @@
 #include "nsIComponentManager.h"
 #include "nsIURIContentListener.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIServiceManager.h"
 #include "nsBoxLayoutState.h"
 #include "nsIBox.h"

layout/mathml/base/src/nsMathMLmactionFrame.cpp

@@ -43,6 +43,7 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDOMElement.h"
 
 #include "nsIDOMEventReceiver.h"

mailnews/absync/src/nsAbSync.cpp

@@ -43,6 +43,7 @@
 #include "nsMsgI18N.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeNode.h"
 #include "nsIPrompt.h"

mailnews/absync/src/nsAbSyncPostEngine.h

@@ -28,6 +28,7 @@
 #include "nsFileStream.h"
 #include "nsIAbSyncPostEngine.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsCURILoader.h"
 #include "nsIURIContentListener.h"
 #include "nsIURI.h"

mailnews/base/src/nsMsgPrintEngine.cpp

@@ -36,6 +36,7 @@
 #include "nsMsgUtils.h"
 #include "nsIWebProgress.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIMsgMailSession.h"
 #include "nsMsgPrintEngine.h"

mailnews/base/src/nsMsgWindow.cpp

@@ -35,6 +35,7 @@
 #include "nsILoadGroup.h"
 #include "nsIMsgMailNewsUrl.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIWebProgress.h"
 #include "nsIWebProgressListener.h"
 #include "nsPIDOMWindow.h"

mailnews/base/util/nsMsgDBFolder.cpp

@@ -43,6 +43,7 @@
 #include "nsIMsgWindow.h"
 #include "nsIPrompt.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIStringBundle.h"
 
 

mailnews/base/util/nsMsgFolder.cpp

@@ -57,6 +57,7 @@
 #include "nsIMsgWindow.h"
 #include "nsIPrompt.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIStringBundle.h"
 #include "nsTextFormatter.h"
 

mailnews/base/util/nsMsgIncomingServer.cpp

@@ -54,6 +54,7 @@
 #include "nsIRDFService.h"
 #include "nsRDFCID.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #ifdef DEBUG_sspitzer
 #define DEBUG_MSGINCOMING_SERVER

mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -33,6 +33,7 @@
 #include "nsIWebProgress.h"
 #include "nsIWebProgressListener.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIIOService.h"
 #include "nsNetCID.h"
 

mailnews/base/util/nsMsgProtocol.h

@@ -32,6 +32,7 @@
 #include "nsCOMPtr.h"
 #include "nsIFileSpec.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIStreamProvider.h"
 #include "nsIProgressEventSink.h"
 #include "nsITransport.h"

mailnews/compose/src/nsMsgSend.cpp

@@ -73,6 +73,7 @@
 #include "nsMimeTypes.h"
 #include "nsISmtpUrl.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocumentEncoder.h"    // for editor output flags
 #include "nsILoadGroup.h"
 #include "nsMsgSendReport.h"

mailnews/compose/src/nsSmtpUrl.h

@@ -33,6 +33,7 @@
 #include "nsIAuthPrompt.h"
 #include "nsISmtpServer.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 class nsMailtoUrl : public nsIMailtoUrl, public nsIURI
 {

mailnews/compose/src/nsURLFetcher.h

@@ -29,6 +29,7 @@
 #include "nsIStreamListener.h"
 
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsCURILoader.h"
 #include "nsIURIContentListener.h"
 #include "nsIWebProgressListener.h"

mailnews/imap/src/nsImapMailFolder.cpp

@@ -59,6 +59,7 @@
 #include "nsIPrompt.h"
 #include "nsIDocShell.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsSpecialSystemDirectory.h"
 #include "nsXPIDLString.h"
 #include "nsIImapFlagAndUidState.h"

mailnews/imap/src/nsImapProtocol.h

@@ -35,6 +35,7 @@
 #include "nsString.h"
 #include "nsIProgressEventSink.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsITransport.h"
 
 // imap event sinks

mailnews/imap/src/nsImapUrl.cpp

@@ -49,6 +49,7 @@
 #include "nsIMsgFolder.h"
 #include "nsIDocShell.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsMsgUtils.h"
 #include "nsIMsgHdr.h"
 #include "nsIProgressEventSink.h"

mailnews/local/src/nsLocalMailFolder.cpp

@@ -79,6 +79,7 @@
 #include "nsIDocShell.h"
 #include "nsIPrompt.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPop3URL.h"
 #include "nsIMsgMailSession.h"
 #include "nsIMsgFolderCompactor.h"

mailnews/mime/emitters/src/nsMimeBaseEmitter.h

@@ -42,6 +42,7 @@
 #include "nsVoidArray.h"
 #include "nsIMimeConverter.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 //
 // The base emitter will serve as the place to do all of the caching,

mailnews/mime/src/nsStreamConverter.cpp

@@ -52,6 +52,7 @@
 #include "nsStreamConverter.h"
 #include "nsICategoryManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #define PREF_MAIL_DISPLAY_GLYPH "mail.display_glyph"
 #define PREF_MAIL_DISPLAY_STRUCT "mail.display_struct"

mailnews/news/src/nsNNTPNewsgroupList.cpp

@@ -73,6 +73,7 @@
 
 #include "nsISupportsPrimitives.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIMsgWindow.h"
 #include "nsIDocShell.h"
 

mailnews/news/src/nsNewsFolder.cpp

@@ -71,6 +71,7 @@
 #include "nsNewsSummarySpec.h"
 
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsReadableUtils.h"
 #include "nsNewsDownloader.h"

modules/libjar/nsJARChannel.h

@@ -33,6 +33,7 @@
 #include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
 #include "prmon.h"

modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp

@@ -25,6 +25,7 @@
 #include "nsIIconURI.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsXPIDLString.h"
 #include "nsMimeTypes.h"
 #include "nsMemory.h"

modules/libpr0n/decoders/icon/mac/nsIconChannel.h

@@ -24,6 +24,7 @@
 #include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIURI.h"
 
 class nsIFile;

modules/libpr0n/decoders/icon/win/nsIconChannel.cpp

@@ -25,6 +25,7 @@
 #include "nsIIconURI.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsXPIDLString.h"
 #include "nsMimeTypes.h"
 #include "nsMemory.h"

modules/libpr0n/decoders/icon/win/nsIconChannel.h

@@ -28,6 +28,7 @@
 #include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIURI.h"
 
 class nsIFile;

modules/libpr0n/decoders/mng/imgContainerMNG.cpp

@@ -22,6 +22,7 @@
 #include "imgContainerMNG.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "gfxIImageFrame.h"
 #include "nsIImage.h"
 #include "nsIInputStream.h"

modules/libpr0n/src/imgContainer.cpp

@@ -27,6 +27,7 @@
 
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "gfxIImageFrame.h"
 #include "nsIImage.h"
 #include "nsMemory.h"

modules/oji/src/nsJVMManager.cpp

@@ -59,6 +59,7 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "nsIStringBundle.h"
 

modules/plugin/base/src/nsPluginViewer.cpp

@@ -40,6 +40,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIWebBrowserChrome.h"

netwerk/base/public/nsNetUtil.h

@@ -32,6 +32,7 @@
 #include "nsIRequestObserverProxy.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsIIOService.h"

netwerk/base/src/nsFileTransport.cpp

@@ -26,6 +26,7 @@
 #include "nsFileTransport.h"
 #include "nsFileTransportService.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsAutoLock.h"
 #include "netCore.h"
 #include "nsIFileStreams.h"

netwerk/base/src/nsFileTransport.h

@@ -40,6 +40,7 @@
 #include "nsIOutputStream.h"
 #include "nsIStreamIO.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIFile.h"
 #include "prlog.h"
 #include "nsFileTransportService.h"

netwerk/base/src/nsInputStreamChannel.h

@@ -31,6 +31,7 @@
 #include "nsIStreamListener.h"
 #include "nsIStreamProvider.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIProgressEventSink.h"
 #include "nsIStreamIO.h"
 #include "nsITransport.h"

netwerk/base/src/nsLoadGroup.h

@@ -31,6 +31,7 @@
 #include "nsWeakPtr.h"
 #include "nsWeakReference.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 class  nsISupportsArray;
 

netwerk/base/src/nsSocketTransport.cpp

@@ -37,6 +37,7 @@
 #include "nsISocketProviderService.h"
 #include "nsStdURL.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIProxyObjectManager.h"
 #include "nsXPIDLString.h"
 #include "nsNetUtil.h"

netwerk/base/src/nsSocketTransport.h

@@ -39,6 +39,7 @@
 #include "nsIPipe.h"
 #include "nsIProgressEventSink.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIFileStreams.h"
 
 #define NS_SOCKET_TRANSPORT_SEGMENT_SIZE        (2*1024)

netwerk/base/src/nsStorageTransport.h

@@ -32,6 +32,7 @@
 #include "nsCOMPtr.h"
 
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIProgressEventSink.h"
 
 /**

netwerk/cache/src/nsCacheEntryDescriptor.h

@@ -30,6 +30,7 @@
 #include "nsIOutputStream.h"
 #include "nsITransport.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 /******************************************************************************
 * nsCacheEntryDescriptor

netwerk/protocol/data/src/nsDataChannel.cpp

@@ -29,6 +29,7 @@
 #include "nsILoadGroup.h"
 #include "plbase64.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIPipe.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"

netwerk/protocol/data/src/nsDataChannel.h

@@ -33,6 +33,7 @@
 #include "nsIStreamListener.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsCOMPtr.h"
 
 class nsDataChannel : public nsIDataChannel {