Bug 271824: do_GetFastLoadService should use nsGetServiceByCID. r=/sr=/a=bsmedberg

content/xul/document/src/nsXULContentSink.cpp

@@ -83,9 +83,8 @@
 #include "jscntxt.h"  // for JSVERSION_HAS_XML
 #include "nsCRT.h"
 
-#include "nsIFastLoadService.h"         // XXXbe temporary
+#include "nsXULPrototypeDocument.h"     // XXXbe temporary
-#include "nsIObjectInputStream.h"       // XXXbe temporary
+#include "nsICSSLoader.h"
-#include "nsXULDocument.h"              // XXXbe temporary
 
 #include "nsUnicharUtils.h"
 #include "nsGkAtoms.h"

content/xul/document/src/nsXULDocument.cpp

@@ -104,7 +104,6 @@
 #include "nsIXBLService.h"
 #include "nsCExternalHandlerService.h"
 #include "nsMimeTypes.h"
-#include "nsIFastLoadService.h"
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
 #include "nsIFocusController.h"

content/xul/document/src/nsXULDocument.h

@@ -79,8 +79,6 @@ class nsIXULPrototypeScript;
 struct JSObject;
 struct PRLogModuleInfo;
 
-#include "nsIFastLoadService.h"         // XXXbe temporary?
-
 /**
  * The XUL document class
  */

js/src/xpconnect/loader/mozJSComponentLoader.h

@@ -59,8 +59,6 @@
 #include "nsIPrincipal.h"
 #endif
 
-class nsIFastLoadService;
-
 /* 6bd13476-1dd2-11b2-bbef-f0ccb5fa64b6 (thanks, mozbot) */
 
 #define MOZJSCOMPONENTLOADER_CID \

xpcom/io/nsIFastLoadService.idl

@@ -133,11 +133,17 @@ interface nsIFastLoadService : nsISupports
 # include "nsIServiceManager.h"
 #endif
 
-inline const nsGetServiceByCIDWithError
+inline const nsGetServiceByContractID
-do_GetFastLoadService(nsresult *aResultCode = 0)
+do_GetFastLoadService()
 {
-    static NS_DEFINE_CID(kFastLoadServiceCID, NS_FASTLOADSERVICE_CID);
+    return nsGetServiceByContractID(NS_FASTLOADSERVICE_CONTRACTID);
-    return nsGetServiceByCIDWithError(kFastLoadServiceCID, aResultCode);
+}
+
+inline const nsGetServiceByContractIDWithError
+do_GetFastLoadService(nsresult *aResultCode)
+{
+    return nsGetServiceByContractIDWithError(NS_FASTLOADSERVICE_CONTRACTID,
+                                             aResultCode);
 }
 
 inline nsresult