--- a/config/nsStaticComponents.h
+++ b/config/nsStaticComponents.h
@@ -33,15 +33,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsStaticComponents_h__
 #define nsStaticComponents_h__
 
+#include "mozilla/Module.h"
+
 // These symbols are provided by nsStaticComponents.cpp, and also by other
 // static component providers such as nsStaticXULComponents (libxul).
 
-extern nsStaticModuleInfo const *const kPStaticModules;
-extern PRUint32 const kStaticModuleCount;
+extern mozilla::Module const *const *const kPStaticModules;
 
 #endif

--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -201,16 +201,17 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_
 #include "jsregexp.h"
 #include "jstypedarray.h"
 #include "xpcprivate.h"
 #include "nsScriptSecurityManager.h"
 #include "nsIChannelPolicy.h"
 #include "nsChannelPolicy.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsContentDLF.h"
+#include "nsHTMLMediaElement.h"
 
 using namespace mozilla::dom;
 
 const char kLoadAsData[] = "loadAsData";
 
 static const char kJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
 static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID);
 static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
@@ -6079,16 +6080,29 @@ nsIContentUtils::FindInternalContentView
   if (NS_SUCCEEDED(rv)) {
     docFactory = do_GetService(contractID);
     if (docFactory && aLoaderType) {
       *aLoaderType = contractID.EqualsLiteral(CONTENT_DLF_CONTRACTID) ? TYPE_CONTENT : TYPE_UNKNOWN;
     }   
     return docFactory.forget();
   }
 
+  if (nsHTMLMediaElement::IsOggEnabled()) {
+    for (int i = 0; i < NS_ARRAY_LENGTH(nsHTMLMediaElement::gOggTypes); ++i) {
+      const char* type = nsHTMLMediaElement::gOggTypes[i];
+      if (!strcmp(aType, type)) {
+        docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1");
+        if (docFactory && aLoaderType) {
+          *aLoaderType = TYPE_CONTENT;
+        }
+        return docFactory.forget();
+      }
+    }
+  }
+
   if (AVAILABLE == pluginEnabled) {
     docFactory = do_GetService(PLUGIN_DLF_CONTRACTID);
     if (docFactory && aLoaderType) {
       *aLoaderType = TYPE_PLUGIN;
     }
     return docFactory.forget();
   }
 

--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -233,36 +233,42 @@ public:
   void UpdateMediaSize(nsIntSize size);
 
   // Returns the CanPlayStatus indicating if we can handle this
   // MIME type. The MIME type should not include the codecs parameter.
   // If it returns anything other than CANPLAY_NO then it also
   // returns a null-terminated list of supported codecs
   // in *aSupportedCodecs. This list should not be freed, it is static data.
   static CanPlayStatus CanHandleMediaType(const char* aMIMEType,
-                                          const char*** aSupportedCodecs);
+                                          char const *const ** aSupportedCodecs);
 
   // Returns the CanPlayStatus indicating if we can handle the
   // full MIME type including the optional codecs parameter.
   static CanPlayStatus GetCanPlay(const nsAString& aType);
 
   // Returns true if we should handle this MIME type when it appears
   // as an <object> or as a toplevel page. If, in practice, our support
   // for the type is more limited than appears in the wild, we should return
   // false here even if CanHandleMediaType would return true.
   static PRBool ShouldHandleMediaType(const char* aMIMEType);
 
-  /**
-   * Initialize data for available media types
-   */
-  static void InitMediaTypes();
-  /**
-   * Shutdown data for available media types
-   */
-  static void ShutdownMediaTypes();
+  static bool IsOggEnabled();
+  static bool IsOggType(const nsACString& aType);
+  static const char gOggTypes[3][16];
+  static char const *const gOggCodecs[3];
+
+  static bool IsWaveEnabled();
+  static bool IsWaveType(const nsACString& aType);
+  static const char gWaveTypes[4][16];
+  static char const *const gWaveCodecs[2];
+
+  static bool IsWebMEnabled();
+  static bool IsWebMType(const nsACString& aType);
+  static const char gWebMTypes[2][17];
+  static char const *const gWebMCodecs[4];
 
   /**
    * Called when a child source element is added to this media element. This
    * may queue a load() task if appropriate.
    */
   void NotifyAddedSource();
 
   /**

--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -1183,112 +1183,118 @@ void nsHTMLMediaElement::UnbindFromTree(
   if (!mPaused && mNetworkState != nsIDOMHTMLMediaElement::NETWORK_EMPTY)
     Pause();
   nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent);
 }
 
 #ifdef MOZ_OGG
 // See http://www.rfc-editor.org/rfc/rfc5334.txt for the definitions
 // of Ogg media types and codec types
-static const char gOggTypes[][16] = {
+const char nsHTMLMediaElement::gOggTypes[3][16] = {
   "video/ogg",
   "audio/ogg",
   "application/ogg"
 };
 
-static const char* gOggCodecs[] = {
+char const *const nsHTMLMediaElement::gOggCodecs[3] = {
   "vorbis",
   "theora",
   nsnull
 };
 
-static PRBool IsOggEnabled()
+bool
+nsHTMLMediaElement::IsOggEnabled()
 {
   return nsContentUtils::GetBoolPref("media.ogg.enabled");
 }
 
-static PRBool IsOggType(const nsACString& aType)
+bool
+nsHTMLMediaElement::IsOggType(const nsACString& aType)
 {
   if (!IsOggEnabled())
     return PR_FALSE;
   for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gOggTypes); ++i) {
     if (aType.EqualsASCII(gOggTypes[i]))
       return PR_TRUE;
   }
   return PR_FALSE;
 }
 #endif
 
 #ifdef MOZ_WAVE
 // See http://www.rfc-editor.org/rfc/rfc2361.txt for the definitions
 // of WAVE media types and codec types. However, the audio/vnd.wave
 // MIME type described there is not used.
-static const char gWaveTypes[][16] = {
+const char nsHTMLMediaElement::gWaveTypes[4][16] = {
   "audio/x-wav",
   "audio/wav",
   "audio/wave",
   "audio/x-pn-wav"
 };
 
-static const char* gWaveCodecs[] = {
+char const *const nsHTMLMediaElement::gWaveCodecs[2] = {
   "1", // Microsoft PCM Format
   nsnull
 };
 
-static PRBool IsWaveEnabled()
+bool
+nsHTMLMediaElement::IsWaveEnabled()
 {
   return nsContentUtils::GetBoolPref("media.wave.enabled");
 }
 
-static PRBool IsWaveType(const nsACString& aType)
+bool
+nsHTMLMediaElement::IsWaveType(const nsACString& aType)
 {
   if (!IsWaveEnabled())
     return PR_FALSE;
   for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gWaveTypes); ++i) {
     if (aType.EqualsASCII(gWaveTypes[i]))
       return PR_TRUE;
   }
   return PR_FALSE;
 }
 #endif
 
 #ifdef MOZ_WEBM
-static const char gWebMTypes[][17] = {
+const char nsHTMLMediaElement::gWebMTypes[2][17] = {
   "video/webm",
   "audio/webm"
 };
 
-static const char* gWebMCodecs[] = {
+char const *const nsHTMLMediaElement::gWebMCodecs[4] = {
   "vp8",
   "vp8.0",
   "vorbis",
   nsnull
 };
 
-static PRBool IsWebMEnabled()
+bool
+nsHTMLMediaElement::IsWebMEnabled()
 {
   return nsContentUtils::GetBoolPref("media.webm.enabled");
 }
 
-static PRBool IsWebMType(const nsACString& aType)
+bool
+nsHTMLMediaElement::IsWebMType(const nsACString& aType)
 {
   if (!IsWebMEnabled())
     return PR_FALSE;
   for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gWebMTypes); ++i) {
     if (aType.EqualsASCII(gWebMTypes[i]))
       return PR_TRUE;
   }
   return PR_FALSE;
 }
 #endif
 
 /* static */
 nsHTMLMediaElement::CanPlayStatus 
 nsHTMLMediaElement::CanHandleMediaType(const char* aMIMEType,
-                                       const char*** aCodecList)
+                                       char const *const ** aCodecList)
 {
 #ifdef MOZ_OGG
   if (IsOggType(nsDependentCString(aMIMEType))) {
     *aCodecList = gOggCodecs;
     return CANPLAY_MAYBE;
   }
 #endif
 #ifdef MOZ_WAVE
@@ -1321,17 +1327,17 @@ PRBool nsHTMLMediaElement::ShouldHandleM
   // Wave codecs actually in use in the wild that we don't support, and
   // we should allow those to be handled by plugins or helper apps.
   // Furthermore people can play Wave files on most platforms by other
   // means.
   return PR_FALSE;
 }
 
 static PRBool
-CodecListContains(const char** aCodecs, const nsAString& aCodec)
+CodecListContains(char const *const * aCodecs, const nsAString& aCodec)
 {
   for (PRInt32 i = 0; aCodecs[i]; ++i) {
     if (aCodec.EqualsASCII(aCodecs[i]))
       return PR_TRUE;
   }
   return PR_FALSE;
 }
 
@@ -1341,17 +1347,17 @@ nsHTMLMediaElement::GetCanPlay(const nsA
 {
   nsContentTypeParser parser(aType);
   nsAutoString mimeType;
   nsresult rv = parser.GetType(mimeType);
   if (NS_FAILED(rv))
     return CANPLAY_NO;
 
   NS_ConvertUTF16toUTF8 mimeTypeUTF8(mimeType);
-  const char** supportedCodecs;
+  char const *const * supportedCodecs;
   CanPlayStatus status = CanHandleMediaType(mimeTypeUTF8.get(),
                                             &supportedCodecs);
   if (status == CANPLAY_NO)
     return CANPLAY_NO;
 
   nsAutoString codecs;
   rv = parser.GetParameter("codecs", codecs);
   if (NS_FAILED(rv)) {
@@ -1387,67 +1393,16 @@ nsHTMLMediaElement::CanPlayType(const ns
   case CANPLAY_NO: aResult.AssignLiteral(""); break;
   case CANPLAY_YES: aResult.AssignLiteral("probably"); break;
   default:
   case CANPLAY_MAYBE: aResult.AssignLiteral("maybe"); break;
   }
   return NS_OK;
 }
 
-/* static */
-void nsHTMLMediaElement::InitMediaTypes()
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv)) {
-#ifdef MOZ_OGG
-    if (IsOggEnabled()) {
-      for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gOggTypes); i++) {
-        catMan->AddCategoryEntry("Gecko-Content-Viewers", gOggTypes[i],
-                                 "@mozilla.org/content/document-loader-factory;1",
-                                 PR_FALSE, PR_TRUE, nsnull);
-      }
-    }
-#endif
-#ifdef MOZ_WEBM
-    if (IsWebMEnabled()) {
-      for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gWebMTypes); i++) {
-        catMan->AddCategoryEntry("Gecko-Content-Viewers", gWebMTypes[i],
-                                 "@mozilla.org/content/document-loader-factory;1",
-                                 PR_FALSE, PR_TRUE, nsnull);
-      }
-    }
-#endif
-  }
-}
-
-/* static */
-void nsHTMLMediaElement::ShutdownMediaTypes()
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv)) {
-#ifdef MOZ_OGG
-    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gOggTypes); i++) {
-      catMan->DeleteCategoryEntry("Gecko-Content-Viewers", gOggTypes[i], PR_FALSE);
-    }
-#endif
-#ifdef MOZ_WAVE
-    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gWaveTypes); i++) {
-      catMan->DeleteCategoryEntry("Gecko-Content-Viewers", gWaveTypes[i], PR_FALSE);
-    }
-#endif
-#ifdef MOZ_WEBM
-    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(gWebMTypes); i++) {
-      catMan->DeleteCategoryEntry("Gecko-Content-Viewers", gWebMTypes[i], PR_FALSE);
-    }
-#endif
-  }
-}
-
 already_AddRefed<nsMediaDecoder>
 nsHTMLMediaElement::CreateDecoder(const nsACString& aType)
 {
 #ifdef MOZ_OGG
   if (IsOggType(aType)) {
     nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder();
     if (decoder && decoder->Init(this)) {
       return decoder.forget().get();

--- a/dom/src/json/nsJSON.cpp
+++ b/dom/src/json/nsJSON.cpp
@@ -509,17 +509,17 @@ nsJSON::DecodeInternal(nsIInputStream *a
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = cc->SetReturnValueWasSet(PR_TRUE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 NS_NewJSON(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   nsJSON* json = new nsJSON();
   if (!json)
     return NS_ERROR_OUT_OF_MEMORY;
 
   NS_ADDREF(json);
   *aResult = json;

--- a/dom/src/json/nsJSON.h
+++ b/dom/src/json/nsJSON.h
@@ -87,17 +87,17 @@ public:
 protected:
   nsresult EncodeInternal(nsJSONWriter *writer);
   nsresult DecodeInternal(nsIInputStream *aStream,
                           PRInt32 aContentLength,
                           PRBool aNeedsConverter);
   nsCOMPtr<nsIURI> mURI;
 };
 
-NS_IMETHODIMP
+nsresult
 NS_NewJSON(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
 class nsJSONListener : public nsIStreamListener
 {
 public:
   nsJSONListener(JSContext *cx, jsval *rootVal, PRBool needsConverter);
   virtual ~nsJSONListener();
 

--- a/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -43,17 +43,16 @@
 #include "nsDOMError.h"
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
 #include "nsJSProtocolHandler.h"
 #include "nsStringStream.h"
 #include "nsNetUtil.h"
 
 #include "nsIComponentManager.h"
-#include "nsIGenericFactory.h"
 #include "nsIServiceManager.h"
 #include "nsIURI.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptGlobalObjectOwner.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIInterfaceRequestor.h"
@@ -1123,17 +1122,17 @@ nsJSProtocolHandler::Init()
 }
 
 nsJSProtocolHandler::~nsJSProtocolHandler()
 {
 }
 
 NS_IMPL_ISUPPORTS1(nsJSProtocolHandler, nsIProtocolHandler)
 
-NS_METHOD
+nsresult
 nsJSProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
 {
     if (aOuter)
         return NS_ERROR_NO_AGGREGATION;
 
     nsJSProtocolHandler* ph = new nsJSProtocolHandler();
     if (!ph)
         return NS_ERROR_OUT_OF_MEMORY;

--- a/dom/src/jsurl/nsJSProtocolHandler.h
+++ b/dom/src/jsurl/nsJSProtocolHandler.h
@@ -72,17 +72,17 @@ public:
 
     // nsIProtocolHandler methods:
     NS_DECL_NSIPROTOCOLHANDLER
 
     // nsJSProtocolHandler methods:
     nsJSProtocolHandler();
     virtual ~nsJSProtocolHandler();
 
-    static NS_METHOD
+    static nsresult
     Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
     nsresult Init();
 
 protected:
 
     nsresult EnsureUTF8Spec(const nsAFlatCString &aSpec, const char *aCharset, 
                             nsACString &aUTF8Spec);

--- a/dom/src/storage/nsDOMStorage.cpp
+++ b/dom/src/storage/nsDOMStorage.cpp
@@ -525,27 +525,27 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOU
 NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsDOMStorage, nsIDOMStorageObsolete)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMStorage)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMStorageObsolete)
   NS_INTERFACE_MAP_ENTRY(nsIDOMStorageObsolete)
   NS_INTERFACE_MAP_ENTRY(nsPIDOMStorage)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(StorageObsolete)
 NS_INTERFACE_MAP_END
 
-NS_IMETHODIMP
+nsresult
 NS_NewDOMStorage(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   nsDOMStorage* storage = new nsDOMStorage();
   if (!storage)
     return NS_ERROR_OUT_OF_MEMORY;
 
   return storage->QueryInterface(aIID, aResult);
 }
 
-NS_IMETHODIMP
+nsresult
 NS_NewDOMStorage2(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   nsDOMStorage2* storage = new nsDOMStorage2();
   if (!storage)
     return NS_ERROR_OUT_OF_MEMORY;
 
   return storage->QueryInterface(aIID, aResult);
 }

--- a/dom/src/storage/nsDOMStorage.h
+++ b/dom/src/storage/nsDOMStorage.h
@@ -486,20 +486,20 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMSTORAGEEVENTOBSOLETE
   NS_FORWARD_NSIDOMEVENT(nsDOMEvent::)
 
 protected:
   nsString mDomain;
 };
 
-NS_IMETHODIMP
+nsresult
 NS_NewDOMStorage(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
-NS_IMETHODIMP
+nsresult
 NS_NewDOMStorage2(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
 nsresult
 NS_NewDOMStorageList(nsIDOMStorageList** aResult);
 
 PRUint32
 GetOfflinePermission(const nsACString &aDomain);
 

--- a/dom/src/threads/nsDOMThreadService.cpp
+++ b/dom/src/threads/nsDOMThreadService.cpp
@@ -44,17 +44,16 @@
 // Interfaces
 #include "nsIComponentManager.h"
 #include "nsIConsoleService.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMNavigator.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIEventTarget.h"
-#include "nsIGenericFactory.h"
 #include "nsIJSContextStack.h"
 #include "nsIJSRuntimeService.h"
 #include "nsIObserverService.h"
 #include "nsIScriptError.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIServiceManager.h"
 #include "nsISupportsPriority.h"
 #include "nsIThreadPool.h"

--- a/ipc/glue/ScopedXREEmbed.cpp
+++ b/ipc/glue/ScopedXREEmbed.cpp
@@ -81,17 +81,17 @@ ScopedXREEmbed::Start()
   nsCOMPtr<nsIFile> parent;
   rv = localFile->GetParent(getter_AddRefs(parent));
   if (NS_FAILED(rv))
     return;
 
   localFile = do_QueryInterface(parent);
   NS_ENSURE_TRUE(localFile,);
 
-  rv = XRE_InitEmbedding(localFile, localFile, nsnull, nsnull, 0);
+  rv = XRE_InitEmbedding2(localFile, localFile, nsnull);
   if (NS_FAILED(rv))
     return;
 
   mShouldKillEmbedding = true;
 }
 
 void
 ScopedXREEmbed::Stop()

--- a/js/src/xpconnect/idl/Makefile.in
+++ b/js/src/xpconnect/idl/Makefile.in
@@ -60,16 +60,17 @@ XPIDLSRCS	= \
 		nsIXPConnect.idl \
 		nsIXPCSecurityManager.idl \
 		nsIXPCScriptable.idl \
 		nsIScriptError.idl \
 		nsIXPCScriptNotify.idl \
 		nsIScriptableInterfaces.idl \
 		XPCIDispatch.idl \
 		xpcIJSWeakReference.idl \
+		xpcIJSGetFactory.idl \
 		$(NULL)
 
 ifdef XPC_IDISPATCH_SUPPORT
 XPIDLSRCS	+= \
 		nsIDispatchSupport.idl \
 		nsIActiveXSecurityPolicy.idl \
 		$(NULL)
 endif

new file mode 100644
--- /dev/null
+++ b/js/src/xpconnect/idl/xpcIJSGetFactory.idl
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+interface nsIFactory;
+
+/**
+ * Every JS module exports a single NSGetFactory symbol which is converted into this
+ * functional interface type.
+ */
+[scriptable, function, uuid(3FE0C205-D75B-4CAC-9347-D2B855050143)]
+interface xpcIJSGetFactory : nsISupports
+{
+  nsIFactory get(in nsCIDRef aCID);
+};

--- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
@@ -48,20 +48,18 @@
 #include <stdarg.h>
 
 #include "prlog.h"
 
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsICategoryManager.h"
 #include "nsIComponentManager.h"
-#include "nsIComponentManagerObsolete.h"
-#include "nsIGenericFactory.h"
+#include "mozilla/Module.h"
 #include "nsILocalFile.h"
-#include "nsIModule.h"
 #include "nsIServiceManager.h"
 #include "nsISupports.h"
 #include "mozJSComponentLoader.h"
 #include "nsIJSRuntimeService.h"
 #include "nsIJSContextStack.h"
 #include "nsIXPConnect.h"
 #include "nsCRT.h"
 #include "nsMemory.h"
@@ -569,17 +567,17 @@ mozJSComponentLoader::~mozJSComponentLoa
 
     sSelf = nsnull;
 }
 
 mozJSComponentLoader*
 mozJSComponentLoader::sSelf;
 
 NS_IMPL_ISUPPORTS3(mozJSComponentLoader,
-                   nsIModuleLoader,
+                   mozilla::ModuleLoader,
                    xpcIJSModuleLoader,
                    nsIObserver)
  
 nsresult
 mozJSComponentLoader::ReallyInit()
 {
     NS_TIME_FUNCTION;
 
@@ -655,173 +653,154 @@ mozJSComponentLoader::ReallyInit()
 #ifdef DEBUG_shaver_off
     fprintf(stderr, "mJCL: ReallyInit success!\n");
 #endif
     mInitialized = PR_TRUE;
 
     return NS_OK;
 }
 
-NS_IMETHODIMP
-mozJSComponentLoader::LoadModule(nsILocalFile* aComponentFile,
-                                 nsIModule* *aResult)
+const mozilla::Module*
+mozJSComponentLoader::LoadModule(nsILocalFile* aComponentFile)
 {
     nsresult rv;
 
 #ifdef NS_FUNCTION_TIMER
     nsAutoString path__(NS_LITERAL_STRING("N/A"));
     aComponentFile->GetPath(path__);
     NS_TIME_FUNCTION_FMT("%s (line %d) (file: %s)", MOZ_FUNCTION_NAME,
                          __LINE__, nsPromiseFlatCString(NS_LossyConvertUTF16toASCII(path__)).BeginReading());
 #endif
 
     nsCAutoString leafName;
     aComponentFile->GetNativeLeafName(leafName);
     if (!StringTail(leafName, 3).LowerCaseEqualsLiteral(".js"))
-        return NS_ERROR_INVALID_ARG;
+        return NULL;
 
     if (!mInitialized) {
         rv = ReallyInit();
         if (NS_FAILED(rv))
-            return rv;
+            return NULL;
     }
 
     nsCOMPtr<nsIHashable> lfhash(do_QueryInterface(aComponentFile));
     if (!lfhash) {
         NS_ERROR("nsLocalFile not implementing nsIHashable");
-        return NS_NOINTERFACE;
+        return NULL;
     }
 
     ModuleEntry* mod;
-    if (mModules.Get(lfhash, &mod)) {
-        NS_ASSERTION(mod->module, "Bad hashtable data!");
-        NS_ADDREF(*aResult = mod->module);
-        return NS_OK;
-    }
+    if (mModules.Get(lfhash, &mod))
+        return mod;
 
     nsAutoPtr<ModuleEntry> entry(new ModuleEntry);
     if (!entry)
-        return NS_ERROR_OUT_OF_MEMORY;
+        return NULL;
 
     rv = GlobalForLocation(aComponentFile, &entry->global, &entry->location,
                            nsnull);
     if (NS_FAILED(rv)) {
 #ifdef DEBUG_shaver
         fprintf(stderr, "GlobalForLocation failed!\n");
 #endif
-        return rv;
+        return NULL;
     }
 
     nsCOMPtr<nsIXPConnect> xpc = do_GetService(kXPConnectServiceContractID,
                                                &rv);
     if (NS_FAILED(rv))
-        return rv;
+        return NULL;
 
     nsCOMPtr<nsIComponentManager> cm;
     rv = NS_GetComponentManager(getter_AddRefs(cm));
     if (NS_FAILED(rv))
-        return rv;
+        return NULL;
 
     JSCLContextHelper cx(this);
 
     JSObject* cm_jsobj;
     nsCOMPtr<nsIXPConnectJSObjectHolder> cm_holder;
     rv = xpc->WrapNative(cx, entry->global, cm, 
                          NS_GET_IID(nsIComponentManager),
                          getter_AddRefs(cm_holder));
 
     if (NS_FAILED(rv)) {
 #ifdef DEBUG_shaver
         fprintf(stderr, "WrapNative(%p,%p,nsIComponentManager) failed: %x\n",
                 (void *)(JSContext*)cx, (void *)mCompMgr, rv);
 #endif
-        return rv;
+        return NULL;
     }
 
     rv = cm_holder->GetJSObject(&cm_jsobj);
     if (NS_FAILED(rv)) {
 #ifdef DEBUG_shaver
         fprintf(stderr, "GetJSObject of ComponentManager failed\n");
 #endif
-        return rv;
+        return NULL;
     }
 
     JSObject* file_jsobj;
     nsCOMPtr<nsIXPConnectJSObjectHolder> file_holder;
     rv = xpc->WrapNative(cx, entry->global, aComponentFile, 
                          NS_GET_IID(nsIFile),
                          getter_AddRefs(file_holder));
 
     if (NS_FAILED(rv)) {
-        return rv;
+        return NULL;
     }
 
     rv = file_holder->GetJSObject(&file_jsobj);
     if (NS_FAILED(rv)) {
-        return rv;
+        return NULL;
     }
 
     JSCLAutoErrorReporterSetter aers(cx, mozJSLoaderErrorReporter);
 
-    jsval argv[2], retval, NSGetModule_val;
+    jsval argv[2], retval, NSGetFactory_val;
 
-    if (!JS_GetProperty(cx, entry->global, "NSGetModule", &NSGetModule_val) ||
-        JSVAL_IS_VOID(NSGetModule_val)) {
-        return NS_ERROR_FAILURE;
+    if (!JS_GetProperty(cx, entry->global, "NSGetFactory", &NSGetFactory_val) ||
+        JSVAL_IS_VOID(NSGetFactory_val)) {
+        return NULL;
     }
 
-    if (JS_TypeOfValue(cx, NSGetModule_val) != JSTYPE_FUNCTION) {
+    if (JS_TypeOfValue(cx, NSGetFactory_val) != JSTYPE_FUNCTION) {
         nsCAutoString path;
         aComponentFile->GetNativePath(path);
 
-        JS_ReportError(cx, "%s has NSGetModule property that is not a function",
+        JS_ReportError(cx, "%s has NSGetFactory property that is not a function",
                        path.get());
-        return NS_ERROR_FAILURE;
+        return NULL;
     }
     
-    argv[0] = OBJECT_TO_JSVAL(cm_jsobj);
-    argv[1] = OBJECT_TO_JSVAL(file_jsobj);
-    if (!JS_CallFunctionValue(cx, entry->global, NSGetModule_val,
-                              2, argv, &retval)) {
-        return NS_ERROR_FAILURE;
+    JSObject *jsGetFactoryObj;
+    if (!JS_ValueToObject(cx, retval, &jsGetFactoryObj) ||
+        !jsGetFactoryObj) {
+        /* XXX report error properly */
+        return NULL;
     }
 
-#ifdef DEBUG_shaver_off
-    JSString *s = JS_ValueToString(cx, retval);
-    fprintf(stderr, "mJCL: %s::NSGetModule returned %s\n",
-            registryLocation, JS_GetStringBytes(s));
-#endif
-
-    JSObject *jsModuleObj;
-    if (!JS_ValueToObject(cx, retval, &jsModuleObj) ||
-        !jsModuleObj) {
-        /* XXX report error properly */
-        return NS_ERROR_FAILURE;
-    }
-
-    rv = xpc->WrapJS(cx, jsModuleObj,
-                     NS_GET_IID(nsIModule), getter_AddRefs(entry->module));
+    rv = xpc->WrapJS(cx, jsGetFactoryObj,
+                     NS_GET_IID(xpcIJSGetFactory), getter_AddRefs(entry->getfactory));
     if (NS_FAILED(rv)) {
         /* XXX report error properly */
 #ifdef DEBUG
         fprintf(stderr, "mJCL: couldn't get nsIModule from jsval\n");
 #endif
-        return rv;
+        return NULL;
     }
 
     // Cache this module for later
     if (!mModules.Put(lfhash, entry))
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(*aResult = entry->module);
+        return NULL;
 
     // The hash owns the ModuleEntry now, forget about it
     entry.forget();
 
-    return NS_OK;
+    return entry;
 }
 
 // Some stack based classes for cleaning up on early return
 #ifdef HAVE_PR_MEMMAP
 class FileAutoCloser
 {
  public:
     explicit FileAutoCloser(PRFileDesc *file) : mFile(file) {}

--- a/js/src/xpconnect/loader/mozJSComponentLoader.h
+++ b/js/src/xpconnect/loader/mozJSComponentLoader.h
@@ -34,43 +34,42 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "plhash.h"
 #include "jsapi.h"
-#include "nsIModuleLoader.h"
+#include "mozilla/ModuleLoader.h"
 #include "nsIJSRuntimeService.h"
 #include "nsIJSContextStack.h"
 #include "nsISupports.h"
 #include "nsIXPConnect.h"
-#include "nsIModule.h"
 #include "nsIFile.h"
 #include "nsAutoPtr.h"
 #include "nsIFastLoadService.h"
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
 #include "nsITimer.h"
 #include "nsIObserver.h"
 #include "xpcIJSModuleLoader.h"
 #include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
 #ifndef XPCONNECT_STANDALONE
 #include "nsIPrincipal.h"
 #endif
+#include "xpcIJSGetFactory.h"
 
 /* 6bd13476-1dd2-11b2-bbef-f0ccb5fa64b6 (thanks, mozbot) */
 
 #define MOZJSCOMPONENTLOADER_CID \
   {0x6bd13476, 0x1dd2, 0x11b2, \
     { 0xbb, 0xef, 0xf0, 0xcc, 0xb5, 0xfa, 0x64, 0xb6 }}
 #define MOZJSCOMPONENTLOADER_CONTRACTID "@mozilla.org/moz/jsloader;1"
-#define MOZJSCOMPONENTLOADER_TYPE_NAME "text/javascript"
 
 // nsIFastLoadFileIO implementation for component fastload
 class nsXPCFastLoadIO : public nsIFastLoadFileIO
 {
  public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIFASTLOADFILEIO
 
@@ -84,30 +83,32 @@ class nsXPCFastLoadIO : public nsIFastLo
 
     nsCOMPtr<nsIFile> mFile;
     nsCOMPtr<nsIInputStream> mInputStream;
     nsCOMPtr<nsIOutputStream> mOutputStream;
     bool mTruncateOutputFile;
 };
 
 
-class mozJSComponentLoader : public nsIModuleLoader,
+class mozJSComponentLoader : public mozilla::ModuleLoader,
                              public xpcIJSModuleLoader,
                              public nsIObserver
 {
     friend class JSCLContextHelper;
  public:
     NS_DECL_ISUPPORTS
-    NS_DECL_NSIMODULELOADER
     NS_DECL_XPCIJSMODULELOADER
     NS_DECL_NSIOBSERVER
 
     mozJSComponentLoader();
     virtual ~mozJSComponentLoader();
 
+    // ModuleLoader
+    const mozilla::Module* LoadModule(nsILocalFile* aFile);
+
  protected:
     static mozJSComponentLoader* sSelf;
 
     nsresult ReallyInit();
     void UnloadModules();
 
     nsresult GlobalForLocation(nsILocalFile *aComponent,
                                JSObject **aGlobal,
@@ -132,38 +133,42 @@ class mozJSComponentLoader : public nsIM
     nsCOMPtr<nsIObjectOutputStream> mFastLoadOutput;
     nsCOMPtr<nsITimer> mFastLoadTimer;
 #ifndef XPCONNECT_STANDALONE
     nsCOMPtr<nsIPrincipal> mSystemPrincipal;
 #endif
     JSRuntime *mRuntime;
     JSContext *mContext;
 
-    class ModuleEntry
+    class ModuleEntry : public mozilla::Module
     {
     public:
-        ModuleEntry() {
+        ModuleEntry() : mozilla::Module() {
+            
             global = nsnull;
             location = nsnull;
         }
 
         ~ModuleEntry() {
-            module = nsnull;
+            getfactory = NULL;
 
             if (global) {
                 JSAutoRequest ar(sSelf->mContext);
                 JS_ClearScope(sSelf->mContext, global);
                 JS_RemoveRoot(sSelf->mContext, &global);
             }
 
             if (location)
                 NS_Free(location);
         }
 
-        nsCOMPtr<nsIModule>  module;
+        static already_AddRefed<nsIFactory> GetFactory(const mozilla::Module& module,
+                                                       const mozilla::Module::CIDEntry& entry);
+
+        nsCOMPtr<xpcIJSGetFactory> getfactory;
         JSObject            *global;
         char                *location;
     };
 
     friend class ModuleEntry;
 
     nsClassHashtable<nsHashableHashKey, ModuleEntry> mModules;
     nsClassHashtable<nsHashableHashKey, ModuleEntry> mImports;

--- a/js/src/xpconnect/loader/mozJSLoaderConstructors.h
+++ b/js/src/xpconnect/loader/mozJSLoaderConstructors.h
@@ -40,62 +40,22 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef XPCONNECT_STANDALONE
 #define NO_SUBSCRIPT_LOADER
 #endif
 
-#include "nsIGenericFactory.h"
+#include "mozilla/ModuleUtils.h"
 #include "nsICategoryManager.h"
 #include "mozJSComponentLoader.h"
 
 #ifndef NO_SUBSCRIPT_LOADER
 #include "mozJSSubScriptLoader.h"
 const char mozJSSubScriptLoadContractID[] = "@mozilla.org/moz/jssubscript-loader;1";
 #endif
 
-static NS_METHOD
-RegisterJSLoader(nsIComponentManager *aCompMgr, nsIFile *aPath,
-                 const char *registryLocation, const char *componentType,
-                 const nsModuleComponentInfo *info)
-{
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager> catman =
-        do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
-    nsXPIDLCString previous;
-    return catman->AddCategoryEntry("module-loader",
-                                    MOZJSCOMPONENTLOADER_TYPE_NAME,
-                                    MOZJSCOMPONENTLOADER_CONTRACTID,
-                                    PR_TRUE, PR_TRUE, getter_Copies(previous));
-}
-
-static NS_METHOD
-UnregisterJSLoader(nsIComponentManager *aCompMgr, nsIFile *aPath,
-                   const char *registryLocation,
-                   const nsModuleComponentInfo *info)
-{
-    nsresult rv;
-    nsCOMPtr<nsICategoryManager> catman =
-        do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
-    nsXPIDLCString jsLoader;
-    rv = catman->GetCategoryEntry("module-loader",
-                                  MOZJSCOMPONENTLOADER_TYPE_NAME,
-                                  getter_Copies(jsLoader));
-    if (NS_FAILED(rv)) return rv;
-
-    // only unregister if we're the current JS component loader
-    if (!strcmp(jsLoader, MOZJSCOMPONENTLOADER_CONTRACTID)) {
-        return catman->DeleteCategoryEntry("module-loader",
-                                           MOZJSCOMPONENTLOADER_TYPE_NAME,
-                                           PR_TRUE);
-    }
-    return NS_OK;
-}
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSComponentLoader)
 
 #ifndef NO_SUBSCRIPT_LOADER
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSSubScriptLoader)
 #endif

--- a/js/src/xpconnect/shell/xpcshell.cpp
+++ b/js/src/xpconnect/shell/xpcshell.cpp
@@ -68,17 +68,16 @@
 #include "nsILocalFile.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nscore.h"
 #include "nsArrayEnumerator.h"
 #include "nsCOMArray.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsMemory.h"
-#include "nsIGenericFactory.h"
 #include "nsISupportsImpl.h"
 #include "nsIJSRuntimeService.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsIXPCSecurityManager.h"
 #ifdef XP_MACOSX
 #include "xpcshellMacUtils.h"
 #endif
@@ -1768,22 +1767,16 @@ main(int argc, char **argv)
 
     {
         nsCOMPtr<nsIServiceManager> servMan;
         rv = NS_InitXPCOM2(getter_AddRefs(servMan), appDir, &dirprovider);
         if (NS_FAILED(rv)) {
             printf("NS_InitXPCOM2 failed!\n");
             return 1;
         }
-        {
-            nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(servMan);
-            NS_ASSERTION(registrar, "Null nsIComponentRegistrar");
-            if (registrar)
-                registrar->AutoRegister(nsnull);
-        }
 
         nsCOMPtr<nsIJSRuntimeService> rtsvc = do_GetService("@mozilla.org/js/xpc/RuntimeService;1");
         // get the JSRuntime from the runtime svc
         if (!rtsvc) {
             printf("failed to get nsJSRuntimeService!\n");
             return 1;
         }
 

--- a/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/js/src/xpconnect/src/nsXPConnect.cpp
@@ -1065,18 +1065,17 @@ nsXPConnect::InitClasses(JSContext * aJS
     NS_ASSERTION(aGlobalJSObj, "bad param");
 
     // Nest frame chain save/restore in request created by XPCCallContext.
     XPCCallContext ccx(NATIVE_CALLER, aJSContext);
     if(!ccx.IsValid())
         return UnexpectedFailure(NS_ERROR_FAILURE);
     SaveFrame sf(aJSContext);
 
-    if(!xpc_InitJSxIDClassObjects())
-        return UnexpectedFailure(NS_ERROR_FAILURE);
+    xpc_InitJSxIDClassObjects();
 
     if(!xpc_InitWrappedNativeJSOps())
         return UnexpectedFailure(NS_ERROR_FAILURE);
 
     XPCWrappedNativeScope* scope =
         XPCWrappedNativeScope::GetNewOrUsed(ccx, aGlobalJSObj);
 
     if(!scope)

--- a/js/src/xpconnect/src/xpcexception.cpp
+++ b/js/src/xpconnect/src/xpcexception.cpp
@@ -114,16 +114,17 @@ nsXPCException::IterateNSResults(nsresul
 PRUint32
 nsXPCException::GetNSResultCount()
 {
     return RESULT_COUNT;
 }
 
 /***************************************************************************/
 
+NS_IMPL_CLASSINFO(nsXPCException, NULL, nsIClassInfo::DOM_OBJECT)
 NS_INTERFACE_MAP_BEGIN(nsXPCException)
   NS_INTERFACE_MAP_ENTRY(nsIException)
   NS_INTERFACE_MAP_ENTRY(nsIXPCException)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIException)
   NS_IMPL_QUERY_CLASSINFO(nsXPCException)
 NS_INTERFACE_MAP_END_THREADSAFE
 
 NS_IMPL_THREADSAFE_ADDREF(nsXPCException)

--- a/js/src/xpconnect/src/xpcjsid.cpp
+++ b/js/src/xpconnect/src/xpcjsid.cpp
@@ -282,78 +282,28 @@ NS_METHOD GetSharedScriptableHelperForJS
     return NS_OK;
 }
 
 /******************************************************/
 
 static JSBool gClassObjectsWereInited = JS_FALSE;
 
 NS_DECL_CI_INTERFACE_GETTER(nsJSIID)
-// Can't make this static. http://bugzilla.mozilla.org/show_bug.cgi?id=81436
-nsIClassInfo* NS_CLASSINFO_NAME(nsJSIID);
-
-static const nsModuleComponentInfo CI_nsJSIID =
-    {"JSIID",
-     {0x26ecb8d0, 0x35c9, 0x11d5, { 0x90, 0xb2, 0x0, 0x10, 0xa4, 0xe7, 0x3d, 0x9a }},
-     nsnull, nsnull, nsnull,nsnull, nsnull,
-     NS_CI_INTERFACE_GETTER_NAME(nsJSIID),
-     GetSharedScriptableHelperForJSIID,
-     &NS_CLASSINFO_NAME(nsJSIID), nsIClassInfo::THREADSAFE};
+NS_IMPL_CLASSINFO(nsJSIID, GetSharedScriptableHelperForJSIID, nsIClassInfo::THREADSAFE)
 
 NS_DECL_CI_INTERFACE_GETTER(nsJSCID)
-// Can't make this static. http://bugzilla.mozilla.org/show_bug.cgi?id=81436
-nsIClassInfo* NS_CLASSINFO_NAME(nsJSCID);
-
-static const nsModuleComponentInfo CI_nsJSCID =
-    {"JSCID",
-     {0x9255b5b0, 0x35cf, 0x11d5, { 0x90, 0xb2, 0x0, 0x10, 0xa4, 0xe7, 0x3d, 0x9a }},
-     nsnull, nsnull, nsnull,nsnull, nsnull,
-     NS_CI_INTERFACE_GETTER_NAME(nsJSCID), nsnull,
-     &NS_CLASSINFO_NAME(nsJSCID), nsIClassInfo::THREADSAFE};
-
-JSBool xpc_InitJSxIDClassObjects()
-{
-    if(gClassObjectsWereInited)
-        return JS_TRUE;
-
-    nsresult rv = NS_OK;
+NS_IMPL_CLASSINFO(nsJSCID, NULL, nsIClassInfo::THREADSAFE)
 
-    if(!NS_CLASSINFO_NAME(nsJSIID))
-    {
-        nsCOMPtr<nsIGenericFactory> factory;
-        rv = NS_NewGenericFactory(getter_AddRefs(factory), &CI_nsJSIID);
-        if(NS_FAILED(rv))
-            goto return_failure;
-        rv = factory->QueryInterface(NS_GET_IID(nsIClassInfo),
-                                     (void**)&NS_CLASSINFO_NAME(nsJSIID));
-        if(NS_FAILED(rv))
-            goto return_failure;
+void xpc_InitJSxIDClassObjects()
+{
+    if(!gClassObjectsWereInited) {
+        gSharedScriptableHelperForJSIID = new SharedScriptableHelperForJSIID();
+        NS_ADDREF(gSharedScriptableHelperForJSIID);
     }
-
-    if(!NS_CLASSINFO_NAME(nsJSCID))
-    {
-        nsCOMPtr<nsIGenericFactory> factory;
-        rv = NS_NewGenericFactory(getter_AddRefs(factory), &CI_nsJSCID);
-        if(NS_FAILED(rv))
-            goto return_failure;
-        rv = factory->QueryInterface(NS_GET_IID(nsIClassInfo),
-                                     (void**)&NS_CLASSINFO_NAME(nsJSCID));
-        if(NS_FAILED(rv))
-            goto return_failure;
-    }
-
-    gSharedScriptableHelperForJSIID = new SharedScriptableHelperForJSIID();
-    if(!gSharedScriptableHelperForJSIID)
-        goto return_failure;
-    NS_ADDREF(gSharedScriptableHelperForJSIID);
-
     gClassObjectsWereInited = JS_TRUE;
-    return JS_TRUE;
-return_failure:
-    return JS_FALSE;
 }
 
 void xpc_DestroyJSxIDClassObjects()
 {
     NS_IF_RELEASE(NS_CLASSINFO_NAME(nsJSIID));
     NS_IF_RELEASE(NS_CLASSINFO_NAME(nsJSCID));
     NS_IF_RELEASE(gSharedScriptableHelperForJSIID);
 

--- a/js/src/xpconnect/src/xpcmodule.cpp
+++ b/js/src/xpconnect/src/xpcmodule.cpp
@@ -33,55 +33,36 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-/* Module level methods. */
-
-#ifdef XPCONNECT_STANDALONE
-#define NO_SUBSCRIPT_LOADER
-#endif
-
-#include "xpcmodule.h"
+#include "xpcprivate.h"
 
 nsresult
-xpcModuleCtor(nsIModule* self)
+xpcModuleCtor()
 {
     nsXPConnect::InitStatics();
     nsXPCException::InitStatics();
     XPCWrappedNativeScope::InitStatics();
     XPCPerThreadData::InitStatics();
 
 #ifdef XPC_IDISPATCH_SUPPORT
     XPCIDispatchExtension::InitStatics();
 #endif
 
     return NS_OK;
 }
 
 void
-xpcModuleDtor(nsIModule*)
+xpcModuleDtor()
 {
     // Release our singletons
     nsXPConnect::ReleaseXPConnectSingleton();
     xpc_DestroyJSxIDClassObjects();
 #ifdef XPC_IDISPATCH_SUPPORT
     nsDispatchSupport::FreeSingleton();
     XPCIDispatchClassInfo::FreeSingleton();
 #endif
 }
-
-#ifdef XPCONNECT_STANDALONE
-
-/* Module implementation for the xpconnect library. */
-
-XPCONNECT_FACTORIES
-
-static const nsModuleComponentInfo components[] = {
-  XPCONNECT_COMPONENTS
-};
-
-NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(xpconnect, components, xpcModuleCtor, xpcModuleDtor)
-#endif

--- a/js/src/xpconnect/src/xpcmodule.h
+++ b/js/src/xpconnect/src/xpcmodule.h
@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ -33,23 +33,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef xpcmodule_h___
-#define xpcmodule_h___
-
 #include "xpcprivate.h"
-#ifdef MOZ_JSLOADER
 #include "mozJSLoaderConstructors.h"
-#endif
 
 /* Module implementation for the xpconnect library. */
 
 // {DC524540-487E-4501-9AC7-AAA784B17C1C}
 #define XPCVARIANT_CID                                                        \
     {0xdc524540, 0x487e, 0x4501,                                              \
       { 0x9a, 0xc7, 0xaa, 0xa7, 0x84, 0xb1, 0x7c, 0x1c } }
 
@@ -57,181 +52,70 @@
 #define XPC_JSCONTEXT_STACK_ITERATOR_CONTRACTID                               \
     "@mozilla.org/js/xpc/ContextStackIterator;1"
 
 // {FE4F7592-C1FC-4662-AC83-538841318803}
 #define SCRIPTABLE_INTERFACES_CID                                             \
     {0xfe4f7592, 0xc1fc, 0x4662,                                              \
       { 0xac, 0x83, 0x53, 0x88, 0x41, 0x31, 0x88, 0x3 } }
 
-
-#define XPCONNECT_GENERAL_FACTORIES                                           \
-  NS_DECL_CLASSINFO(XPCVariant)                                               \
-  NS_DECL_CLASSINFO(nsXPCException)                                           \
-                                                                              \
-  NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSID)                                      \
-  NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCException)                              \
-  NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCJSContextStackIterator)                 \
-  NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIXPConnect,                      \
-                                           nsXPConnect::GetSingleton)         \
-  NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptError)                               \
-  NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCComponents_Interfaces)
-
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSID)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCException)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCJSContextStackIterator)
+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIXPConnect,
+                                         nsXPConnect::GetSingleton)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptError)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCComponents_Interfaces)
 
 #ifdef XPC_IDISPATCH_SUPPORT
-
-#define XPCONNECT_FACTORIES                                                   \
-  NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIDispatchSupport,                \
-                                           nsDispatchSupport::GetSingleton)   \
-  XPCONNECT_GENERAL_FACTORIES
-
-#else
-
-#define XPCONNECT_FACTORIES XPCONNECT_GENERAL_FACTORIES
-
+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIDispatchSupport,
+                                         nsDispatchSupport::GetSingleton)
 #endif // XPC_IDISPATCH_SUPPORT
 
-
-#ifdef XPCONNECT_STANDALONE
-#define NO_SUBSCRIPT_LOADER
+NS_DEFINE_NAMED_CID(NS_JS_ID_CID);
+NS_DEFINE_NAMED_CID(NS_XPCONNECT_CID);
+NS_DEFINE_NAMED_CID(NS_XPCEXCEPTION_CID);
+NS_DEFINE_NAMED_CID(NS_SCRIPTERROR_CID);
+NS_DEFINE_NAMED_CID(SCRIPTABLE_INTERFACES_CID);
+NS_DEFINE_NAMED_CID(XPCVARIANT_CID);
+NS_DEFINE_NAMED_CID(NS_XPC_JSCONTEXT_STACK_ITERATOR_CID);
+NS_DEFINE_NAMED_CID(MOZJSCOMPONENTLOADER_CID);
+NS_DEFINE_NAMED_CID(MOZ_JSSUBSCRIPTLOADER_CID);
+#ifdef XPC_IDISPATCH_SUPPORT
+NS_DEFINE_NAMED_CID(NS_IDISPATCH_SUPPORT_CID);
+#define XPCIDISPATCH_CIDS \
+  { &kNS_IDISPATCH_SUPPORT_CID, false, NULL, nsIDispatchSupportConstructor },
+#define XPCIDISPATCH_CONTRACTS \
+  { NS_IDISPATCH_SUPPORT_CONTRACTID, &kNS_IDISPATCH_SUPPORT_CID },
+#else
+#define XPCIDISPATCH_CIDS
+#define XPCIDISPATCH_CONTRACTS
 #endif
 
+#define XPCONNECT_CIDENTRIES \
+  { &kNS_JS_ID_CID, false, NULL,  nsJSIDConstructor }, \
+  { &kNS_XPCONNECT_CID, false, NULL,  nsIXPConnectConstructor }, \
+  { &kNS_XPCEXCEPTION_CID, false, NULL, nsXPCExceptionConstructor }, \
+  { &kNS_SCRIPTERROR_CID, false, NULL, nsScriptErrorConstructor }, \
+  { &kSCRIPTABLE_INTERFACES_CID, false, NULL, nsXPCComponents_InterfacesConstructor }, \
+  { &kNS_XPC_JSCONTEXT_STACK_ITERATOR_CID, false, NULL, nsXPCJSContextStackIteratorConstructor }, \
+  { &kMOZJSCOMPONENTLOADER_CID, false, NULL, mozJSComponentLoaderConstructor }, \
+  { &kMOZ_JSSUBSCRIPTLOADER_CID, false, NULL, mozJSSubScriptLoaderConstructor }, \
+  XPCIDISPATCH_CIDS
 
-#define XPCONNECT_GENERAL_COMPONENTS                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    NS_JS_ID_CID,                                                             \
-    XPC_ID_CONTRACTID,                                                        \
-    nsJSIDConstructor                                                         \
-  },                                                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    NS_XPCONNECT_CID,                                                         \
-    XPC_XPCONNECT_CONTRACTID,                                                 \
-    nsIXPConnectConstructor                                                   \
-  },                                                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    NS_XPC_THREAD_JSCONTEXT_STACK_CID,                                        \
-    XPC_CONTEXT_STACK_CONTRACTID,                                             \
-    nsIXPConnectConstructor                                                   \
-  },                                                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    NS_XPCEXCEPTION_CID,                                                      \
-    XPC_EXCEPTION_CONTRACTID,                                                 \
-    nsXPCExceptionConstructor,                                                \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    NS_CI_INTERFACE_GETTER_NAME(nsXPCException),                              \
-    nsnull,                                                                   \
-    &NS_CLASSINFO_NAME(nsXPCException),                                       \
-    nsIClassInfo::DOM_OBJECT                                                  \
-  },                                                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    NS_JS_RUNTIME_SERVICE_CID,                                                \
-    XPC_RUNTIME_CONTRACTID,                                                   \
-    nsIXPConnectConstructor                                                   \
-  },                                                                          \
-  {                                                                           \
-    NS_SCRIPTERROR_CLASSNAME,                                                 \
-    NS_SCRIPTERROR_CID,                                                       \
-    NS_SCRIPTERROR_CONTRACTID,                                                \
-    nsScriptErrorConstructor                                                  \
-  },                                                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    SCRIPTABLE_INTERFACES_CID,                                                \
-    NS_SCRIPTABLE_INTERFACES_CONTRACTID,                                      \
-    nsXPCComponents_InterfacesConstructor,                                    \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsIClassInfo::THREADSAFE                                                  \
-  },                                                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    XPCVARIANT_CID,                                                           \
-    XPCVARIANT_CONTRACTID,                                                    \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    nsnull,                                                                   \
-    NS_CI_INTERFACE_GETTER_NAME(XPCVariant),                                  \
-    nsnull,                                                                   \
-    &NS_CLASSINFO_NAME(XPCVariant)                                            \
-  },                                                                          \
-  {                                                                           \
-    nsnull,                                                                   \
-    NS_XPC_JSCONTEXT_STACK_ITERATOR_CID,                                      \
-    XPC_JSCONTEXT_STACK_ITERATOR_CONTRACTID,                                  \
-    nsXPCJSContextStackIteratorConstructor                                    \
-  }
+#define XPCONNECT_CONTRACTS \
+  { XPC_ID_CONTRACTID, &kNS_JS_ID_CID }, \
+  { XPC_XPCONNECT_CONTRACTID, &kNS_XPCONNECT_CID }, \
+  { XPC_CONTEXT_STACK_CONTRACTID, &kNS_XPCONNECT_CID }, \
+  { XPC_RUNTIME_CONTRACTID, &kNS_XPCONNECT_CID }, \
+  { XPC_EXCEPTION_CONTRACTID, &kNS_XPCEXCEPTION_CID }, \
+  { NS_SCRIPTERROR_CONTRACTID, &kNS_SCRIPTERROR_CID }, \
+  { NS_SCRIPTABLE_INTERFACES_CONTRACTID, &kSCRIPTABLE_INTERFACES_CID }, \
+  { XPC_JSCONTEXT_STACK_ITERATOR_CONTRACTID, &kNS_XPC_JSCONTEXT_STACK_ITERATOR_CID }, \
+  { MOZJSCOMPONENTLOADER_CONTRACTID, &kMOZJSCOMPONENTLOADER_CID }, \
+  { mozJSSubScriptLoadContractID, &kMOZ_JSSUBSCRIPTLOADER_CID }, \
+  XPCIDISPATCH_CONTRACTS
 
-// jsloader stuff
-#ifdef MOZ_JSLOADER
-
-#define XPCONNECT_LOADER_COMPONENTS                                           \
-  {                                                                           \
-    "JS component loader",                                                    \
-    MOZJSCOMPONENTLOADER_CID,                                                 \
-    MOZJSCOMPONENTLOADER_CONTRACTID,                                          \
-    mozJSComponentLoaderConstructor,                                          \
-    RegisterJSLoader,                                                         \
-    UnregisterJSLoader                                                        \
-  },                                                                          \
-  XPCONNECT_SUBSCRIPT_LOADER_COMPONENTS
-
-#ifdef NO_SUBSCRIPT_LOADER
-
-#define XPCONNECT_SUBSCRIPT_LOADER_COMPONENTS
-
-#else
-
-#define XPCONNECT_SUBSCRIPT_LOADER_COMPONENTS                                 \
-  {                                                                           \
-    "JS subscript loader",                                                    \
-    MOZ_JSSUBSCRIPTLOADER_CID,                                                \
-    mozJSSubScriptLoadContractID,                                             \
-    mozJSSubScriptLoaderConstructor                                           \
-  },
-
-#endif // NO_SUBSCRIPT_LOADER
-
-#else
+#define XPCONNECT_CATEGORIES \
+  { "module-loader", "js", MOZJSCOMPONENTLOADER_CONTRACTID },
 
-#define XPCONNECT_LOADER_COMPONENTS
-
-#endif // MOZ_JSLOADER
-
-
-#ifdef XPC_IDISPATCH_SUPPORT
-
-#define XPCONNECT_IDISPATCH_COMPONENTS                                        \
-  {                                                                           \
-    nsnull,                                                                   \
-    NS_IDISPATCH_SUPPORT_CID,                                                 \
-    NS_IDISPATCH_SUPPORT_CONTRACTID,                                          \
-    nsIDispatchSupportConstructor                                             \
-  },
-
-#else
-
-#define XPCONNECT_IDISPATCH_COMPONENTS
-
-#endif // XPC_IDISPATCH_SUPPORT
-
-
-#define XPCONNECT_COMPONENTS                                                  \
-  XPCONNECT_LOADER_COMPONENTS                                                 \
-  XPCONNECT_IDISPATCH_COMPONENTS                                              \
-  XPCONNECT_GENERAL_COMPONENTS
-
-extern nsresult xpcModuleCtor(nsIModule* self);
-extern void xpcModuleDtor(nsIModule*);
-
-#endif /* xpcmodule_h___ */
-
+nsresult xpcModuleCtor();
+void xpcModuleDtor();

--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -64,27 +64,25 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsCycleCollector.h"
 #include "nsISupports.h"
 #include "nsIServiceManager.h"
 #include "nsIClassInfoImpl.h"
 #include "nsIComponentManager.h"
 #include "nsIComponentRegistrar.h"
 #include "nsISupportsPrimitives.h"
-#include "nsIGenericFactory.h"
 #include "nsMemory.h"
 #include "nsIXPConnect.h"
 #include "nsIInterfaceInfo.h"
 #include "nsIInterfaceInfoManager.h"
 #include "nsIXPCScriptable.h"
 #include "nsIXPCSecurityManager.h"
 #include "nsIJSRuntimeService.h"
 #include "nsWeakReference.h"
 #include "nsCOMPtr.h"
-#include "nsIModule.h"
 #include "nsAutoLock.h"
 #include "nsXPTCUtils.h"
 #include "xptinfo.h"
 #include "xpcforwards.h"
 #include "xpclog.h"
 #include "xpccomponents.h"
 #include "xpcexception.h"
 #include "xpcjsid.h"
@@ -411,24 +409,16 @@ private:
 // We have a general rule internally that getters that return addref'd interface
 // pointer generally do so using an 'out' parm. When interface pointers are
 // returned as function call result values they are not addref'd. Exceptions
 // to this rule are noted explicitly.
 
 const PRBool OBJ_IS_GLOBAL = PR_TRUE;
 const PRBool OBJ_IS_NOT_GLOBAL = PR_FALSE;
 
-#define NS_JS_RUNTIME_SERVICE_CID \
-{0xb5e65b52, 0x1dd1, 0x11b2, \
-    { 0xae, 0x8f, 0xf0, 0x92, 0x8e, 0xd8, 0x84, 0x82 }}
-
-#define NS_XPC_THREAD_JSCONTEXT_STACK_CID  \
-{ 0xff8c4d10, 0x3194, 0x11d3, \
-    { 0x98, 0x85, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
-
 class nsXPConnect : public nsIXPConnect,
                     public nsIThreadObserver,
                     public nsSupportsWeakReference,
                     public nsCycleCollectionJSRuntime,
                     public nsCycleCollectionParticipant,
                     public nsIJSRuntimeService,
                     public nsIThreadJSContextStack
 {
@@ -3271,17 +3261,17 @@ private:
 };
 
 /***************************************************************************/
 /*
 * nsJSID implements nsIJSID. It is also used by nsJSIID and nsJSCID as a
 * member (as a hidden implementaion detail) to which they delegate many calls.
 */
 
-extern JSBool xpc_InitJSxIDClassObjects();
+extern void xpc_InitJSxIDClassObjects();
 extern void xpc_DestroyJSxIDClassObjects();
 
 
 class nsJSID : public nsIJSID
 {
 public:
     NS_DEFINE_STATIC_CID_ACCESSOR(NS_JS_ID_CID)
 

--- a/js/src/xpconnect/src/xpcvariant.cpp
+++ b/js/src/xpconnect/src/xpcvariant.cpp
@@ -39,16 +39,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* nsIVariant implementation for xpconnect. */
 
 #include "xpcprivate.h"
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
 
+NS_IMPL_CLASSINFO(XPCVariant, NULL, 0)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XPCVariant)
   NS_INTERFACE_MAP_ENTRY(XPCVariant)
   NS_INTERFACE_MAP_ENTRY(nsIVariant)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_IMPL_QUERY_CLASSINFO(XPCVariant)
 NS_INTERFACE_MAP_END
 NS_IMPL_CI_INTERFACE_GETTER2(XPCVariant, XPCVariant, nsIVariant)
 

--- a/js/src/xpconnect/tests/TestXPC.cpp
+++ b/js/src/xpconnect/tests/TestXPC.cpp
@@ -774,20 +774,16 @@ int main()
     JSObject *glob;
     nsresult rv;
 
     gErrFile = stderr;
     gOutFile = stdout;
     {
         nsCOMPtr<nsIServiceManager> servMan;
         NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull);
-        nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(servMan);
-        NS_ASSERTION(registrar, "Null nsIComponentRegistrar");
-        if(registrar)
-            registrar->AutoRegister(nsnull);
     
         // get the JSRuntime from the runtime svc, if possible
         nsCOMPtr<nsIJSRuntimeService> rtsvc =
                  do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv);
         if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt)) || !rt)
             DIE("FAILED to get a JSRuntime");
 
         jscontext = JS_NewContext(rt, 8192);

--- a/layout/build/nsContentDLF.cpp
+++ b/layout/build/nsContentDLF.cpp
@@ -511,131 +511,14 @@ nsContentDLF::CreateXULDocument(const ch
     rv = docv->LoadStart(doc);
     *aDocViewer = docv;
     NS_IF_ADDREF(*aDocViewer);
   }
    
   return rv;
 }
 
-static nsresult
-RegisterTypes(nsICategoryManager* aCatMgr,
-              const char* const* aTypes,
-              PRBool aPersist = PR_TRUE)
-{
-  nsresult rv = NS_OK;
-  while (*aTypes) {
-    const char* contentType = *aTypes++;
-#ifdef NOISY_REGISTRY
-    printf("Register %s => %s\n", contractid, aPath);
-#endif
-    // add the MIME types layout can handle to the handlers category.
-    // this allows users of layout's viewers (the docshell for example)
-    // to query the types of viewers layout can create.
-    rv = aCatMgr->AddCategoryEntry("Gecko-Content-Viewers", contentType,
-                                   CONTENT_DLF_CONTRACTID,
-                                   aPersist, PR_TRUE, nsnull);
-    if (NS_FAILED(rv)) break;
-  }
-  return rv;
-}
-
-static nsresult UnregisterTypes(nsICategoryManager* aCatMgr,
-                                const char* const* aTypes)
-{
-  nsresult rv = NS_OK;
-  while (*aTypes) {
-    const char* contentType = *aTypes++;
-    rv = aCatMgr->DeleteCategoryEntry("Gecko-Content-Viewers", contentType, PR_TRUE);
-    if (NS_FAILED(rv)) break;
-  }
-  return rv;
-
-}
-
-#ifdef MOZ_SVG
-NS_IMETHODIMP
-nsContentDLF::RegisterSVG()
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catmgr(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  return RegisterTypes(catmgr, gSVGTypes, PR_FALSE);
-}
-
-NS_IMETHODIMP
-nsContentDLF::UnregisterSVG()
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catmgr(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  return UnregisterTypes(catmgr, gSVGTypes);
-}
-#endif
-
-NS_IMETHODIMP
-nsContentDLF::RegisterDocumentFactories(nsIComponentManager* aCompMgr,
-                                        nsIFile* aPath,
-                                        const char *aLocation,
-                                        const char *aType,
-                                        const nsModuleComponentInfo* aInfo)
-{
-  NS_TIME_FUNCTION;
-
-  nsresult rv;
-
-  nsCOMPtr<nsICategoryManager> catmgr(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  do {
-    rv = RegisterTypes(catmgr, gHTMLTypes);
-    if (NS_FAILED(rv))
-      break;
-    rv = RegisterTypes(catmgr, gXMLTypes);
-    if (NS_FAILED(rv))
-      break;
-    rv = RegisterTypes(catmgr, gXULTypes);
-    if (NS_FAILED(rv))
-      break;
-  } while (PR_FALSE);
-  return rv;
-}
-
-NS_IMETHODIMP
-nsContentDLF::UnregisterDocumentFactories(nsIComponentManager* aCompMgr,
-                                          nsIFile* aPath,
-                                          const char* aRegistryLocation,
-                                          const nsModuleComponentInfo* aInfo)
-{
-  NS_TIME_FUNCTION;
-
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catmgr(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  do {
-    rv = UnregisterTypes(catmgr, gHTMLTypes);
-    if (NS_FAILED(rv))
-      break;
-    rv = UnregisterTypes(catmgr, gXMLTypes);
-    if (NS_FAILED(rv))
-      break;
-#ifdef MOZ_SVG
-    rv = UnregisterTypes(catmgr, gSVGTypes);
-    if (NS_FAILED(rv))
-      break;
-#endif
-    rv = UnregisterTypes(catmgr, gXULTypes);
-    if (NS_FAILED(rv))
-      break;
-  } while (PR_FALSE);
-
-  return rv;
-}
-
 PRBool nsContentDLF::IsImageContentType(const char* aContentType) {
   nsCOMPtr<imgILoader> loader(do_GetService("@mozilla.org/image/loader;1"));
   PRBool isDecoderAvailable = PR_FALSE;
   loader->SupportImageWithMimeType(aContentType, &isDecoderAvailable);
   return isDecoderAvailable;
 }

--- a/layout/build/nsContentDLF.h
+++ b/layout/build/nsContentDLF.h
@@ -36,26 +36,25 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsContentDLF_h__
 #define nsContentDLF_h__
 
 #include "nsIDocumentLoaderFactory.h"
 #include "nsIDocumentViewer.h"
 #include "nsIDocument.h"
+#include "nsMimeTypes.h"
 
 class nsIChannel;
-class nsIComponentManager;
 class nsIContentViewer;
 class nsIDocumentViewer;
 class nsIFile;
 class nsIInputStream;
 class nsILoadGroup;
 class nsIStreamListener;
-struct nsModuleComponentInfo;
 
 #define CONTENT_DLF_CONTRACTID "@mozilla.org/content/document-loader-factory;1"
 #define PLUGIN_DLF_CONTRACTID "@mozilla.org/content/plugin/document-loader-factory;1"
 
 class nsContentDLF : public nsIDocumentLoaderFactory
 {
 public:
   nsContentDLF();
@@ -78,36 +77,68 @@ public:
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
                              const char* aContentType,
                              nsISupports* aContainer,
                              nsISupports* aExtraInfo,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aDocViewer);
 
-#ifdef MOZ_SVG
-  static NS_IMETHODIMP RegisterSVG();
-  static NS_IMETHODIMP UnregisterSVG();
-#endif
-
-  static NS_IMETHODIMP
-  RegisterDocumentFactories(nsIComponentManager* aCompMgr,
-                            nsIFile* aPath,
-                            const char *aLocation,
-                            const char *aType,
-                            const nsModuleComponentInfo* aInfo);
-
-  static NS_IMETHODIMP
-  UnregisterDocumentFactories(nsIComponentManager* aCompMgr,
-                              nsIFile* aPath,
-                              const char* aRegistryLocation,
-                              const nsModuleComponentInfo* aInfo);
-
 private:
   static nsresult EnsureUAStyleSheet();
   static PRBool IsImageContentType(const char* aContentType);
 };
 
 nsresult
 NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult);
 
+#ifdef MOZ_VIEW_SOURCE
+#define CONTENTDLF_VIEWSOURCE_CATEGORIES \
+    { "Gecko-Content-Viewers", VIEWSOURCE_CONTENT_TYPE, "@mozilla.org/content/document-loader-factory;1" },
+#else
+#define CONTENTDLF_VIEWSOURCE_CATEGORIES
+#endif
+
+#ifdef MOZ_MATHML
+#define CONTENTDLF_MATHML_CATEGORIES \
+    { "Gecko-Content-Viewers", APPLICATION_MATHML_XML, "@mozilla.org/content/document-loader-factory;1" },
+#else
+#define CONTENTDLF_MATHML_CATEGORIES
+#endif
+
+#ifdef MOZ_SVG
+#define CONTENTDLF_SVG_CATEGORIES \
+    { "Gecko-Content-Viewers", IMAGE_SVG_XML, "@mozilla.org/content/document-loader-factory;1" },
+#else
+#define CONTENTDLF_SVG_CATEGORIES
 #endif
 
+#ifdef MOZ_WEBM
+#define CONTENTDLF_WEBM_CATEGORIES \
+    { "Gecko-Content-Viewers", VIDEO_WEBM, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", AUDIO_WEBM, "@mozilla.org/content/document-loader-factory;1" },
+#else
+#define CONTENTDLF_WEBM_CATEGORIES
+#endif
+
+#define CONTENTDLF_CATEGORIES \
+    { "Gecko-Content-Viewers", TEXT_HTML, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", TEXT_PLAIN, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", TEXT_CSS, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", TEXT_JAVASCRIPT, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", TEXT_ECMASCRIPT, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", APPLICATION_JAVASCRIPT, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", APPLICATION_ECMASCRIPT, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", APPLICATION_XJAVASCRIPT, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", APPLICATION_XHTML_XML, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", TEXT_XML, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", APPLICATION_XML, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", APPLICATION_RDF_XML, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", TEXT_RDF, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", TEXT_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", APPLICATION_CACHED_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
+    CONTENTDLF_VIEWSOURCE_CATEGORIES \
+    CONTENTDLF_MATHML_CATEGORIES \
+    CONTENTDLF_SVG_CATEGORIES \
+    CONTENTDLF_WEBM_CATEGORIES
+
+#endif
+

--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -32,43 +32,42 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "xpcmodule.h"
+#include "mozilla/ModuleUtils.h"
 #include "nsLayoutStatics.h"
 #include "nsContentCID.h"
 #include "nsContentDLF.h"
 #include "nsContentPolicyUtils.h"
 #include "nsDataDocumentContentPolicy.h"
 #include "nsNoDataProtocolContentPolicy.h"
 #include "nsDOMCID.h"
 #include "nsHTMLContentSerializer.h"
 #include "nsHTMLParts.h"
 #include "nsGenericHTMLElement.h"
-#include "nsICategoryManager.h"
 #include "nsIComponentManager.h"
 #include "nsIContentIterator.h"
 #include "nsIContentSerializer.h"
 #include "nsIController.h"
 #include "nsIControllers.h"
 #include "nsIDOMDOMImplementation.h"
 #include "nsIDOMEventGroup.h"
 #include "nsIDOMRange.h"
 #include "nsIDocument.h"
 #include "nsIDocumentEncoder.h"
 #include "nsIDocumentViewer.h"
 #include "nsIEventListenerManager.h"
 #include "nsIFactory.h"
 #include "nsFrameSelection.h"
 #include "nsIFrameUtil.h"
-#include "nsIGenericFactory.h"
 #include "nsIFragmentContentSink.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsIHTMLToTextSink.h"
 #include "nsILayoutDebugger.h"
 #include "nsINameSpaceManager.h"
 #include "nsINodeInfo.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
@@ -156,17 +155,17 @@
 { 0x4f5e62b8, 0xd659, 0x4156, { 0x84, 0xfc, 0x2f, 0x60, 0x99, 0x40, 0x03, 0x69 }}
 
 static NS_DEFINE_CID(kEditorCommandTableCID, NS_EDITORCOMMANDTABLE_CID);
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlaintextEditor)
 
 // Constructor of a controller which is set up to use, internally, a
 // singleton command-table pre-filled with editor commands.
-static NS_METHOD
+static nsresult
 nsEditorControllerConstructor(nsISupports *aOuter, REFNSIID aIID,
                                             void **aResult)
 {
   nsresult rv;
   nsCOMPtr<nsIController> controller = do_CreateInstance("@mozilla.org/embedcomp/base-command-controller;1", &rv);
   if (NS_FAILED(rv)) return rv;
 
   nsCOMPtr<nsIControllerCommandTable> editorCommandTable = do_GetService(kEditorCommandTableCID, &rv);
@@ -181,17 +180,17 @@ nsEditorControllerConstructor(nsISupport
   rv = controllerContext->Init(editorCommandTable);
   if (NS_FAILED(rv)) return rv;
   
   return controller->QueryInterface(aIID, aResult);
 }
 
 
 // Constructor for a command-table pref-filled with editor commands
-static NS_METHOD
+static nsresult
 nsEditorCommandTableConstructor(nsISupports *aOuter, REFNSIID aIID,
                                             void **aResult)
 {
   nsresult rv;
   nsCOMPtr<nsIControllerCommandTable> commandTable =
       do_CreateInstance(NS_CONTROLLERCOMMANDTABLE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) return rv;
   
@@ -258,20 +257,20 @@ static NS_DEFINE_CID(kWindowCommandTable
 #include "inDOMUtils.h"
 #endif /* MOZ_NO_INSPECTOR_APIS */
 
 #ifdef MOZ_XUL
 #include "nsIXULDocument.h"
 #include "nsIXULPrototypeCache.h"
 #include "nsIXULSortService.h"
 
-NS_IMETHODIMP
+nsresult
 NS_NewXULContentBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
-NS_IMETHODIMP
+nsresult
 NS_NewXULTreeBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 #endif
 
 static void Shutdown();
 
 #ifdef MOZ_XTF
 #include "nsIXTFService.h"
 #include "nsIXMLContentBuilder.h"
@@ -338,30 +337,35 @@ LayoutShutdownObserver::Observe(nsISuppo
 //-----------------------------------------------------------------------------
 
 static PRBool gInitialized = PR_FALSE;
 
 // Perform our one-time intialization for this module
 
 // static
 nsresult
-Initialize(nsIModule* aSelf)
+Initialize()
 {
-  NS_PRECONDITION(!gInitialized, "module already initialized");
   if (gInitialized) {
-    return NS_OK;
+    NS_ERROR("Recursive layout module initialization");
+    return NS_ERROR_FAILURE;
   }
 
   NS_ASSERTION(sizeof(PtrBits) == sizeof(void *),
                "Eeek! You'll need to adjust the size of PtrBits to the size "
                "of a pointer on your platform.");
 
   gInitialized = PR_TRUE;
 
-  nsresult rv = nsLayoutStatics::Initialize();
+  nsresult rv;
+  rv = xpcModuleCtor();
+  if (NS_FAILED(rv))
+    return rv;
+
+  rv = nsLayoutStatics::Initialize();
   if (NS_FAILED(rv)) {
     Shutdown();
     return rv;
   }
 
   // Add our shutdown observer.
   nsCOMPtr<nsIObserverService> observerService =
     mozilla::services::GetObserverService();
@@ -434,20 +438,20 @@ nsresult NS_NewHTMLCopyTextEncoder(nsIDo
 nsresult NS_NewTextEncoder(nsIDocumentEncoder** aResult);
 nsresult NS_NewXBLService(nsIXBLService** aResult);
 nsresult NS_NewContentPolicy(nsIContentPolicy** aResult);
 nsresult NS_NewDOMEventGroup(nsIDOMEventGroup** aResult);
 
 nsresult NS_NewEventListenerService(nsIEventListenerService** aResult);
 nsresult NS_NewGlobalMessageManager(nsIChromeFrameMessageManager** aResult);
 
-NS_IMETHODIMP NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+nsresult NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
 #define MAKE_CTOR(ctor_, iface_, func_)                   \
-static NS_IMETHODIMP                                      \
+static nsresult                                           \
 ctor_(nsISupports* aOuter, REFNSIID aIID, void** aResult) \
 {                                                         \
   *aResult = nsnull;                                      \
   if (aOuter)                                             \
     return NS_ERROR_NO_AGGREGATION;                       \
   iface_* inst;                                           \
   nsresult rv = func_(&inst);                             \
   if (NS_SUCCEEDED(rv)) {                                 \
@@ -554,17 +558,17 @@ MAKE_CTOR(CreateCanvasRenderingContextWe
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsStyleSheetService, Init)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSURI)
 
 // views are not refcounted, so this is the same as
 // NS_GENERIC_FACTORY_CONSTRUCTOR without the NS_ADDREF/NS_RELEASE
 #define NS_GENERIC_FACTORY_CONSTRUCTOR_NOREFS(_InstanceClass)                 \
-static NS_IMETHODIMP                                                          \
+static nsresult                                                               \
 _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID,               \
                             void **aResult)                                   \
 {                                                                             \
     nsresult rv;                                                              \
                                                                               \
     _InstanceClass * inst;                                                    \
                                                                               \
     *aResult = NULL;                                                          \
@@ -580,257 +584,79 @@ static NS_IMETHODIMP                    
     }                                                                         \
     rv = inst->QueryInterface(aIID, aResult);                                 \
                                                                               \
     return rv;                                                                \
 }                                                                             \
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsViewManager)
 
-static NS_IMETHODIMP
+static nsresult
 CreateHTMLImgElement(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   *aResult = nsnull;
   if (aOuter)
     return NS_ERROR_NO_AGGREGATION;
   // Note! NS_NewHTMLImageElement is special cased to handle a null nodeinfo
   nsIContent* inst = NS_NewHTMLImageElement(nsnull);
   nsresult rv = NS_ERROR_OUT_OF_MEMORY;
   if (inst) {
     NS_ADDREF(inst);
     rv = inst->QueryInterface(aIID, aResult);
     NS_RELEASE(inst);
   }
   return rv;
 }
 
-static NS_IMETHODIMP
-RegisterHTMLImgElement(nsIComponentManager *aCompMgr,
-                       nsIFile* aPath,
-                       const char* aRegistryLocation,
-                       const char* aComponentType,
-                       const nsModuleComponentInfo* aInfo)
-{
-  nsCOMPtr<nsICategoryManager> catman =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
-
-  if (!catman)
-    return NS_ERROR_FAILURE;
-
-  nsXPIDLCString previous;
-  nsresult rv = catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY,
-                                         "Image", NS_HTMLIMGELEMENT_CONTRACTID,
-                                         PR_TRUE, PR_TRUE, getter_Copies(previous));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_PROTO_ALIAS_CATEGORY,
-                                  "Image", "HTMLImageElement",
-                                  PR_TRUE, PR_TRUE, getter_Copies(previous));
-}
-
-static NS_IMETHODIMP
-UnregisterHTMLImgElement(nsIComponentManager* aCompMgr,
-                         nsIFile* aPath,
-                         const char* aRegistryLocation,
-                         const nsModuleComponentInfo* aInfo)
-{
-  // XXX remove category entry
-  return NS_OK;
-}
-
-static NS_IMETHODIMP
+static nsresult
 CreateHTMLOptionElement(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   *aResult = nsnull;
   if (aOuter)
     return NS_ERROR_NO_AGGREGATION;
   // Note! NS_NewHTMLOptionElement is special cased to handle a null nodeinfo
   nsIContent* inst = NS_NewHTMLOptionElement(nsnull);
   nsresult rv = NS_ERROR_OUT_OF_MEMORY;
   if (inst) {
     NS_ADDREF(inst);
     rv = inst->QueryInterface(aIID, aResult);
     NS_RELEASE(inst);
   }
   return rv;
 }
 
-static NS_IMETHODIMP
-RegisterHTMLOptionElement(nsIComponentManager *aCompMgr,
-                          nsIFile* aPath,
-                          const char* aRegistryLocation,
-                          const char* aComponentType,
-                          const nsModuleComponentInfo* aInfo)
-{
-  nsCOMPtr<nsICategoryManager> catman =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
-
-  if (!catman)
-    return NS_ERROR_FAILURE;
-
-  nsXPIDLCString previous;
-  nsresult rv = catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY,
-                                         "Option", NS_HTMLOPTIONELEMENT_CONTRACTID,
-                                         PR_TRUE, PR_TRUE, getter_Copies(previous));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_PROTO_ALIAS_CATEGORY,
-                                  "Option", "HTMLOptionElement",
-                                  PR_TRUE, PR_TRUE, getter_Copies(previous));
-}
-
-static NS_IMETHODIMP
-UnregisterHTMLOptionElement(nsIComponentManager* aCompMgr,
-                            nsIFile* aPath,
-                            const char* aRegistryLocation,
-                            const nsModuleComponentInfo* aInfo)
-{
-  // XXX remove category entry
-  return NS_OK;
-}
-
 #ifdef MOZ_MEDIA
-static NS_IMETHODIMP
+static nsresult
 CreateHTMLAudioElement(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   *aResult = nsnull;
   if (aOuter)
     return NS_ERROR_NO_AGGREGATION;
   // Note! NS_NewHTMLAudioElement is special cased to handle a null nodeinfo
   nsCOMPtr<nsIContent> inst(NS_NewHTMLAudioElement(nsnull));
   return inst ? inst->QueryInterface(aIID, aResult) : NS_ERROR_OUT_OF_MEMORY;
 }
-
-static NS_IMETHODIMP
-RegisterHTMLAudioElement(nsIComponentManager *aCompMgr,
-                         nsIFile* aPath,
-                         const char* aRegistryLocation,
-                         const char* aComponentType,
-                         const nsModuleComponentInfo* aInfo)
-{
-  nsCOMPtr<nsICategoryManager> catman =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
-
-  if (!catman)
-    return NS_ERROR_FAILURE;
-
-  nsXPIDLCString previous;
-  nsresult rv = catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY,
-                                         "Audio", NS_HTMLAUDIOELEMENT_CONTRACTID,
-                                         PR_TRUE, PR_TRUE, getter_Copies(previous));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_PROTO_ALIAS_CATEGORY,
-                                  "Audio", "HTMLAudioElement",
-                                  PR_TRUE, PR_TRUE, getter_Copies(previous));
-}
-
-static NS_IMETHODIMP
-UnregisterHTMLAudioElement(nsIComponentManager* aCompMgr,
-                           nsIFile* aPath,
-                           const char* aRegistryLocation,
-                           const nsModuleComponentInfo* aInfo)
-{
-  // XXX remove category entry
-  return NS_OK;
-}
 #endif
 
-static NS_METHOD
-RegisterDataDocumentContentPolicy(nsIComponentManager *aCompMgr,
-                                  nsIFile* aPath,
-                                  const char* aRegistryLocation,
-                                  const char* aComponentType,
-                                  const nsModuleComponentInfo* aInfo)
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catman =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  nsXPIDLCString previous;
-  return catman->AddCategoryEntry("content-policy",
-                                  NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID,
-                                  NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID,
-                                  PR_TRUE, PR_TRUE, getter_Copies(previous));
-}
-
-static NS_METHOD
-UnregisterDataDocumentContentPolicy(nsIComponentManager *aCompMgr,
-                                    nsIFile *aPath,
-                                    const char *registryLocation,
-                                    const nsModuleComponentInfo *info)
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catman =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  
-  return catman->DeleteCategoryEntry("content-policy",
-                                     NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID,
-                                     PR_TRUE);
-}
-
-static NS_METHOD
-RegisterNoDataProtocolContentPolicy(nsIComponentManager *aCompMgr,
-                                    nsIFile* aPath,
-                                    const char* aRegistryLocation,
-                                    const char* aComponentType,
-                                    const nsModuleComponentInfo* aInfo)
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catman =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  nsXPIDLCString previous;
-  return catman->AddCategoryEntry("content-policy",
-                                  NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID,
-                                  NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID,
-                                  PR_TRUE, PR_TRUE, getter_Copies(previous));
-}
-
-static NS_METHOD
-UnregisterNoDataProtocolContentPolicy(nsIComponentManager *aCompMgr,
-                                      nsIFile *aPath,
-                                      const char *registryLocation,
-                                      const nsModuleComponentInfo *info)
-{
-  nsresult rv;
-  nsCOMPtr<nsICategoryManager> catman =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  
-  return catman->DeleteCategoryEntry("content-policy",
-                                     NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID,
-                                     PR_TRUE);
-}
-
-static NS_METHOD
+static nsresult
 CreateWindowCommandTableConstructor(nsISupports *aOuter,
                                     REFNSIID aIID, void **aResult)
 {
   nsresult rv;
   nsCOMPtr<nsIControllerCommandTable> commandTable =
       do_CreateInstance(NS_CONTROLLERCOMMANDTABLE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) return rv;
 
   rv = nsWindowCommandRegistration::RegisterWindowCommands(commandTable);
   if (NS_FAILED(rv)) return rv;
 
   return commandTable->QueryInterface(aIID, aResult);
 }
 
-static NS_METHOD
+static nsresult
 CreateWindowControllerWithSingletonCommandTable(nsISupports *aOuter,
                                       REFNSIID aIID, void **aResult)
 {
   nsresult rv;
   nsCOMPtr<nsIController> controller =
        do_CreateInstance("@mozilla.org/embedcomp/base-command-controller;1", &rv);
 
  if (NS_FAILED(rv)) return rv;
@@ -858,962 +684,479 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseDOM
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGeolocation, Init)
 
 #define NS_GEOLOCATION_SERVICE_CID \
   { 0x404d02a, 0x1CA, 0xAAAB, { 0x47, 0x62, 0x94, 0x4b, 0x1b, 0xf2, 0xf7, 0xb5 } }
 
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsGeolocationService, nsGeolocationService::GetGeolocationService)
 
-static NS_METHOD
-CSPServiceRegistration(nsIComponentManager *aCompMgr,
-                       nsIFile *aPath,
-                       const char *registryLocation,
-                       const char *componentType,
-                       const nsModuleComponentInfo *info)
-{
-  nsresult rv;
-  nsCOMPtr<nsIServiceManager> servman = do_QueryInterface((nsISupports*)aCompMgr, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsICategoryManager> catman;
-  rv = servman->GetServiceByContractID(NS_CATEGORYMANAGER_CONTRACTID,
-                                       NS_GET_IID(nsICategoryManager),
-                                       getter_AddRefs(catman));
-  if (NS_FAILED(rv))
-    return rv;
-  
-  nsXPIDLCString previous;
-  rv = catman->AddCategoryEntry("content-policy",
-                                "CSPService",
-                                CSPSERVICE_CONTRACTID,
-                                PR_TRUE,
-                                PR_TRUE,
-                                getter_Copies(previous));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = catman->AddCategoryEntry("net-channel-event-sinks",
-                                "CSPService",
-                                CSPSERVICE_CONTRACTID,
-                                PR_TRUE,
-                                PR_TRUE,
-                                getter_Copies(previous));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return rv;
-}
-
-static NS_METHOD
-CSPServiceUnregistration(nsIComponentManager *aCompMgr,
-                         nsIFile *aPath,
-                         const char *registryLocation,
-                         const nsModuleComponentInfo *info){
-  nsresult rv;
-
-  nsCOMPtr<nsIServiceManager> servman = do_QueryInterface((nsISupports*)aCompMgr, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsICategoryManager> catman;
-  rv = servman->GetServiceByContractID(NS_CATEGORYMANAGER_CONTRACTID,
-                                       NS_GET_IID(nsICategoryManager),
-                                       getter_AddRefs(catman));
-  if (NS_FAILED(rv)) return rv;
-
-  rv = catman->DeleteCategoryEntry("content-policy",
-                                   "CSPService",
-                                   PR_TRUE);
-
-  rv = catman->DeleteCategoryEntry("net-channel-event-sinks",
-                                   "CSPService",
-                                   PR_TRUE);
-
-  return rv;
-}
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(CSPService)
 
-XPCONNECT_FACTORIES
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrincipal)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecurityNameSet)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsSystemPrincipal,
     nsScriptSecurityManager::SystemPrincipalSingletonConstructor)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNullPrincipal, Init)
 
-NS_DECL_CLASSINFO(nsPrincipal)
-NS_DECL_CLASSINFO(nsSystemPrincipal)
-NS_DECL_CLASSINFO(nsNullPrincipal)
-
-static NS_IMETHODIMP
+static nsresult
 Construct_nsIScriptSecurityManager(nsISupports *aOuter, REFNSIID aIID, 
                                    void **aResult)
 {
     if (!aResult)
         return NS_ERROR_NULL_POINTER;
     *aResult = nsnull;
     if (aOuter)
         return NS_ERROR_NO_AGGREGATION;
     nsScriptSecurityManager *obj = nsScriptSecurityManager::GetScriptSecurityManager();
     if (!obj) 
         return NS_ERROR_OUT_OF_MEMORY;
     if (NS_FAILED(obj->QueryInterface(aIID, aResult)))
         return NS_ERROR_FAILURE;
     return NS_OK;
 }
 
-static NS_METHOD 
-RegisterSecurityNameSet(nsIComponentManager *aCompMgr,
-                        nsIFile *aPath,
-                        const char *registryLocation,
-                        const char *componentType,
-                        const nsModuleComponentInfo *info)
-{
-    nsresult rv = NS_OK;
-
-    nsCOMPtr<nsICategoryManager> catman =
-        do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-
-    if (NS_FAILED(rv))
-        return rv;
-
-    nsXPIDLCString previous;
-    rv = catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_STATIC_NAMESET_CATEGORY,
-                                  "PrivilegeManager",
-                                  NS_SECURITYNAMESET_CONTRACTID,
-                                  PR_TRUE, PR_TRUE, getter_Copies(previous));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = catman->AddCategoryEntry("app-startup", "Script Security Manager",
-                                  "service," NS_SCRIPTSECURITYMANAGER_CONTRACTID,
-                                  PR_TRUE, PR_TRUE,
-                                  getter_Copies(previous));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return rv;
-}
-
-// The list of components we register
-static const nsModuleComponentInfo gLayoutComponents[] = {
 #ifdef DEBUG
-  { "Frame utility",
-    NS_FRAME_UTIL_CID,
-    nsnull,
-    CreateNewFrameUtil },
-  { "Layout debugger",
-    NS_LAYOUT_DEBUGGER_CID,
-    nsnull,
-    CreateNewLayoutDebugger },
+NS_DEFINE_NAMED_CID(NS_FRAME_UTIL_CID);
+NS_DEFINE_NAMED_CID(NS_LAYOUT_DEBUGGER_CID);
+#endif
+NS_DEFINE_NAMED_CID(NS_FRAMETRAVERSAL_CID);
+NS_DEFINE_NAMED_CID(NS_PRESSHELL_CID);
+NS_DEFINE_NAMED_CID(NS_BOXOBJECT_CID);
+#ifdef MOZ_XUL
+NS_DEFINE_NAMED_CID(NS_LISTBOXOBJECT_CID);
+NS_DEFINE_NAMED_CID(NS_MENUBOXOBJECT_CID);
+NS_DEFINE_NAMED_CID(NS_POPUPBOXOBJECT_CID);
+NS_DEFINE_NAMED_CID(NS_CONTAINERBOXOBJECT_CID);
+NS_DEFINE_NAMED_CID(NS_SCROLLBOXOBJECT_CID);
+NS_DEFINE_NAMED_CID(NS_TREEBOXOBJECT_CID);
+#endif // MOZ_XUL
+#ifndef MOZ_NO_INSPECTOR_APIS
+#ifdef MOZ_XUL
+NS_DEFINE_NAMED_CID(IN_DOMVIEW_CID);
+#endif
+NS_DEFINE_NAMED_CID(IN_DEEPTREEWALKER_CID);
+NS_DEFINE_NAMED_CID(IN_FLASHER_CID);
+NS_DEFINE_NAMED_CID(IN_CSSVALUESEARCH_CID);
+NS_DEFINE_NAMED_CID(IN_DOMUTILS_CID);
+#endif // MOZ_NO_INSPECTOR_APIS
+NS_DEFINE_NAMED_CID(NS_NAMESPACEMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_EVENTLISTENERMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_DOMEVENTGROUP_CID);
+NS_DEFINE_NAMED_CID(NS_DOCUMENT_VIEWER_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLDOCUMENT_CID);
+NS_DEFINE_NAMED_CID(NS_DOM_IMPLEMENTATION_CID);
+NS_DEFINE_NAMED_CID(NS_XMLDOCUMENT_CID);
+#ifdef MOZ_SVG
+NS_DEFINE_NAMED_CID(NS_SVGDOCUMENT_CID);
+#endif
+NS_DEFINE_NAMED_CID(NS_IMAGEDOCUMENT_CID);
+NS_DEFINE_NAMED_CID(NS_DOMSELECTION_CID);
+NS_DEFINE_NAMED_CID(NS_FRAMESELECTION_CID);
+NS_DEFINE_NAMED_CID(NS_RANGE_CID);
+NS_DEFINE_NAMED_CID(NS_RANGEUTILS_CID);
+NS_DEFINE_NAMED_CID(NS_CONTENTITERATOR_CID);
+NS_DEFINE_NAMED_CID(NS_PRECONTENTITERATOR_CID);
+NS_DEFINE_NAMED_CID(NS_SUBTREEITERATOR_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLIMAGEELEMENT_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLOPTIONELEMENT_CID);
+#ifdef MOZ_MEDIA
+NS_DEFINE_NAMED_CID(NS_HTMLAUDIOELEMENT_CID);
 #endif
+NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXT2D_CID);
+NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXTWEBGL_CID);
+NS_DEFINE_NAMED_CID(NS_TEXT_ENCODER_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLCOPY_TEXT_ENCODER_CID);
+NS_DEFINE_NAMED_CID(NS_XMLCONTENTSERIALIZER_CID);
+NS_DEFINE_NAMED_CID(NS_XHTMLCONTENTSERIALIZER_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLCONTENTSERIALIZER_CID);
+NS_DEFINE_NAMED_CID(NS_PLAINTEXTSERIALIZER_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLFRAGMENTSINK_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLFRAGMENTSINK2_CID);
+NS_DEFINE_NAMED_CID(NS_HTMLPARANOIDFRAGMENTSINK_CID);
+NS_DEFINE_NAMED_CID(MOZ_SANITIZINGHTMLSERIALIZER_CID);
+NS_DEFINE_NAMED_CID(NS_XMLFRAGMENTSINK_CID);
+NS_DEFINE_NAMED_CID(NS_XMLFRAGMENTSINK2_CID);
+NS_DEFINE_NAMED_CID(NS_XHTMLPARANOIDFRAGMENTSINK_CID);
+NS_DEFINE_NAMED_CID(NS_XBLSERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_CONTENTPOLICY_CID);
+NS_DEFINE_NAMED_CID(NS_DATADOCUMENTCONTENTPOLICY_CID);
+NS_DEFINE_NAMED_CID(NS_NODATAPROTOCOLCONTENTPOLICY_CID);
+NS_DEFINE_NAMED_CID(NS_XULCONTROLLERS_CID);
+#ifdef MOZ_XUL
+NS_DEFINE_NAMED_CID(NS_XULSORTSERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_XULTEMPLATEBUILDER_CID);
+NS_DEFINE_NAMED_CID(NS_XULTREEBUILDER_CID);
+NS_DEFINE_NAMED_CID(NS_XULPOPUPMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_XULDOCUMENT_CID);
+NS_DEFINE_NAMED_CID(NS_XULPROTOTYPECACHE_CID);
+#endif
+#ifdef MOZ_XTF
+NS_DEFINE_NAMED_CID(NS_XTFSERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_XMLCONTENTBUILDER_CID);
+#endif
+NS_DEFINE_NAMED_CID(NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID);
+NS_DEFINE_NAMED_CID(NS_WYCIWYGPROTOCOLHANDLER_CID);
+NS_DEFINE_NAMED_CID(NS_SYNCLOADDOMSERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
+NS_DEFINE_NAMED_CID(NS_BASE_DOM_EXCEPTION_CID);
+NS_DEFINE_NAMED_CID(NS_JSPROTOCOLHANDLER_CID);
+NS_DEFINE_NAMED_CID(NS_JSURI_CID);
+NS_DEFINE_NAMED_CID(NS_WINDOWCOMMANDTABLE_CID);
+NS_DEFINE_NAMED_CID(NS_WINDOWCONTROLLER_CID);
+NS_DEFINE_NAMED_CID(NS_VIEW_MANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_PLUGINDOCLOADERFACTORY_CID);
+NS_DEFINE_NAMED_CID(NS_PLUGINDOCUMENT_CID);
+#ifdef MOZ_MEDIA
+NS_DEFINE_NAMED_CID(NS_VIDEODOCUMENT_CID);
+#endif
+NS_DEFINE_NAMED_CID(NS_STYLESHEETSERVICE_CID);
+NS_DEFINE_NAMED_CID(TRANSFORMIIX_XSLT_PROCESSOR_CID);
+NS_DEFINE_NAMED_CID(TRANSFORMIIX_XPATH_EVALUATOR_CID);
+NS_DEFINE_NAMED_CID(TRANSFORMIIX_XPATH1_SCHEME_CID);
+NS_DEFINE_NAMED_CID(TRANSFORMIIX_NODESET_CID);
+NS_DEFINE_NAMED_CID(NS_XMLSERIALIZER_CID);
+NS_DEFINE_NAMED_CID(NS_FILEREADER_CID);
+NS_DEFINE_NAMED_CID(NS_FORMDATA_CID);
+NS_DEFINE_NAMED_CID(NS_FILEDATAPROTOCOLHANDLER_CID);
+NS_DEFINE_NAMED_CID(NS_XMLHTTPREQUEST_CID);
+NS_DEFINE_NAMED_CID(NS_DOMPARSER_CID);
+NS_DEFINE_NAMED_CID(NS_DOMSTORAGE_CID);
+NS_DEFINE_NAMED_CID(NS_DOMSTORAGE2_CID);
+NS_DEFINE_NAMED_CID(NS_DOMSTORAGEMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_DOMJSON_CID);
+NS_DEFINE_NAMED_CID(NS_TEXTEDITOR_CID);
+#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
+#ifdef ENABLE_EDITOR_API_LOG
+NS_DEFINE_NAMED_CID(NS_HTMLEDITOR_CID);
+#else
+NS_DEFINE_NAMED_CID(NS_HTMLEDITOR_CID);
+#endif
+#endif
+NS_DEFINE_NAMED_CID(NS_EDITORCONTROLLER_CID);
+NS_DEFINE_NAMED_CID(NS_EDITORCOMMANDTABLE_CID);
+#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
+NS_DEFINE_NAMED_CID(NS_TEXTSERVICESDOCUMENT_CID);
+#endif
+NS_DEFINE_NAMED_CID(NS_GEOLOCATION_SERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_GEOLOCATION_CID);
+NS_DEFINE_NAMED_CID(NS_FOCUSMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_ICONTENTUTILS_CID);
+NS_DEFINE_NAMED_CID(CSPSERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_EVENTLISTENERSERVICE_CID);
+NS_DEFINE_NAMED_CID(NSCHANNELPOLICY_CID);
+NS_DEFINE_NAMED_CID(NS_SCRIPTSECURITYMANAGER_CID);
+NS_DEFINE_NAMED_CID(NS_PRINCIPAL_CID);
+NS_DEFINE_NAMED_CID(NS_SYSTEMPRINCIPAL_CID);
+NS_DEFINE_NAMED_CID(NS_NULLPRINCIPAL_CID);
+NS_DEFINE_NAMED_CID(NS_SECURITYNAMESET_CID);
 
-  { "Frame Traversal",
-    NS_FRAMETRAVERSAL_CID,
-    nsnull,
-    CreateNewFrameTraversal },
-
-  // XXX ick
-  { "Presentation shell",
-    NS_PRESSHELL_CID,
-    nsnull,
-    CreateNewPresShell },
-
-  // XXX end ick
-
-  { "Box Object",
-    NS_BOXOBJECT_CID,
-    "@mozilla.org/layout/xul-boxobject;1",
-    CreateNewBoxObject },
-
+static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
+  XPCONNECT_CIDENTRIES
+#ifdef DEBUG
+  { &kNS_FRAME_UTIL_CID, false, NULL, CreateNewFrameUtil },
+  { &kNS_LAYOUT_DEBUGGER_CID, false, NULL, CreateNewLayoutDebugger },
+#endif
+  { &kNS_FRAMETRAVERSAL_CID, false, NULL, CreateNewFrameTraversal },
+  { &kNS_PRESSHELL_CID, false, NULL, CreateNewPresShell },
+  { &kNS_BOXOBJECT_CID, false, NULL, CreateNewBoxObject },
 #ifdef MOZ_XUL
-  { "XUL Listbox Box Object",
-    NS_LISTBOXOBJECT_CID,
-    "@mozilla.org/layout/xul-boxobject-listbox;1",
-    CreateNewListBoxObject },
-
-  { "XUL Menu Box Object",
-    NS_MENUBOXOBJECT_CID,
-    "@mozilla.org/layout/xul-boxobject-menu;1",
-    CreateNewMenuBoxObject },
-
-  { "XUL Popup Box Object",
-    NS_POPUPBOXOBJECT_CID,
-    "@mozilla.org/layout/xul-boxobject-popup;1",
-    CreateNewPopupBoxObject },
-
-  { "Container Box Object",
-    NS_CONTAINERBOXOBJECT_CID,
-    "@mozilla.org/layout/xul-boxobject-container;1",
-    CreateNewContainerBoxObject },
-
-  { "XUL ScrollBox Object",
-    NS_SCROLLBOXOBJECT_CID,
-    "@mozilla.org/layout/xul-boxobject-scrollbox;1",
-    CreateNewScrollBoxObject },
-
-  { "XUL Tree Box Object",
-    NS_TREEBOXOBJECT_CID,
-    "@mozilla.org/layout/xul-boxobject-tree;1",
-    CreateNewTreeBoxObject },
-
+  { &kNS_LISTBOXOBJECT_CID, false, NULL, CreateNewListBoxObject },
+  { &kNS_MENUBOXOBJECT_CID, false, NULL, CreateNewMenuBoxObject },
+  { &kNS_POPUPBOXOBJECT_CID, false, NULL, CreateNewPopupBoxObject },
+  { &kNS_CONTAINERBOXOBJECT_CID, false, NULL, CreateNewContainerBoxObject },
+  { &kNS_SCROLLBOXOBJECT_CID, false, NULL, CreateNewScrollBoxObject },
+  { &kNS_TREEBOXOBJECT_CID, false, NULL, CreateNewTreeBoxObject },
 #endif // MOZ_XUL
-
 #ifndef MOZ_NO_INSPECTOR_APIS
 #ifdef MOZ_XUL
-  { "DOM View",
-    IN_DOMVIEW_CID, 
-    "@mozilla.org/inspector/dom-view;1",
-    inDOMViewConstructor },
-#endif
-
-  { "Deep Tree Walker", 
-    IN_DEEPTREEWALKER_CID, 
-    "@mozilla.org/inspector/deep-tree-walker;1",
-    inDeepTreeWalkerConstructor },
-
-  { "Flasher", 
-    IN_FLASHER_CID, 
-    "@mozilla.org/inspector/flasher;1", 
-    inFlasherConstructor },
-
-  { "CSS Value Search", 
-    IN_CSSVALUESEARCH_CID, 
-    "@mozilla.org/inspector/search;1?type=cssvalue", 
-    inCSSValueSearchConstructor },
-
-  { "DOM Utils", 
-    IN_DOMUTILS_CID, 
-    "@mozilla.org/inspector/dom-utils;1", 
-    inDOMUtilsConstructor },
-
-
-#endif // MOZ_NO_INSPECTOR_APIS
-
-  { "Namespace manager",
-    NS_NAMESPACEMANAGER_CID,
-    NS_NAMESPACEMANAGER_CONTRACTID,
-    CreateNameSpaceManager },
-
-  { "Event listener manager",
-    NS_EVENTLISTENERMANAGER_CID,
-    nsnull,
-    CreateEventListenerManager },
-
-  { "DOM Event group",
-    NS_DOMEVENTGROUP_CID,
-    nsnull,
-    CreateDOMEventGroup },
-
-  { "Document Viewer",
-    NS_DOCUMENT_VIEWER_CID,
-    nsnull,
-    CreateDocumentViewer },
-
-  { "HTML document",
-    NS_HTMLDOCUMENT_CID,
-    nsnull,
-    CreateHTMLDocument },
-
-  { "DOM implementation",
-    NS_DOM_IMPLEMENTATION_CID,
-    nsnull,
-    CreateDOMImplementation },
-
-
-  { "XML document",
-    NS_XMLDOCUMENT_CID,
-    "@mozilla.org/xml/xml-document;1",
-    CreateXMLDocument },
-
-#ifdef MOZ_SVG
-  { "SVG document",
-    NS_SVGDOCUMENT_CID,
-    "@mozilla.org/svg/svg-document;1",
-    CreateSVGDocument },
+  { &kIN_DOMVIEW_CID, false, NULL, inDOMViewConstructor },
 #endif
-
-  { "Image document",
-    NS_IMAGEDOCUMENT_CID,
-    nsnull,
-    CreateImageDocument },
-
-  { "Dom selection",
-    NS_DOMSELECTION_CID,
-    "@mozilla.org/content/dom-selection;1",
-    CreateDOMSelection },
-
-  { "Frame selection",
-    NS_FRAMESELECTION_CID,
-    nsnull,
-    CreateSelection },
-
-  { "Range",
-    NS_RANGE_CID,
-    "@mozilla.org/content/range;1",
-    CreateRange },
-
-  { "Range Utils",
-    NS_RANGEUTILS_CID,
-    "@mozilla.org/content/range-utils;1",
-    CreateRangeUtils },
-
-  { "Content iterator",
-    NS_CONTENTITERATOR_CID,
-    "@mozilla.org/content/post-content-iterator;1",
-    CreateContentIterator },
-
-  { "Pre Content iterator",
-    NS_PRECONTENTITERATOR_CID,
-    "@mozilla.org/content/pre-content-iterator;1",
-    CreatePreContentIterator },
-
-  { "Subtree iterator",
-    NS_SUBTREEITERATOR_CID,
-    "@mozilla.org/content/subtree-content-iterator;1",
-    CreateSubtreeIterator },
-
-  // Needed to support "new Option;", "new Image;" and "new Audio;" in JavaScript
-  { "HTML img element",
-    NS_HTMLIMAGEELEMENT_CID,
-    NS_HTMLIMGELEMENT_CONTRACTID,
-    CreateHTMLImgElement,
-    RegisterHTMLImgElement, 
-    UnregisterHTMLImgElement },
-
-  { "HTML option element",
-    NS_HTMLOPTIONELEMENT_CID,
-    NS_HTMLOPTIONELEMENT_CONTRACTID,
-    CreateHTMLOptionElement,
-    RegisterHTMLOptionElement,
-    UnregisterHTMLOptionElement },
-
-#ifdef MOZ_MEDIA
-  { "HTML audio element",
-    NS_HTMLAUDIOELEMENT_CID,
-    NS_HTMLAUDIOELEMENT_CONTRACTID,
-    CreateHTMLAudioElement,
-    RegisterHTMLAudioElement,
-    UnregisterHTMLAudioElement },
+  { &kIN_DEEPTREEWALKER_CID, false, NULL, inDeepTreeWalkerConstructor },
+  { &kIN_FLASHER_CID, false, NULL, inFlasherConstructor },
+  { &kIN_CSSVALUESEARCH_CID, false, NULL, inCSSValueSearchConstructor },
+  { &kIN_DOMUTILS_CID, false, NULL, inDOMUtilsConstructor },
+#endif // MOZ_NO_INSPECTOR_APIS
+  { &kNS_NAMESPACEMANAGER_CID, false, NULL, CreateNameSpaceManager },
+  { &kNS_EVENTLISTENERMANAGER_CID, false, NULL, CreateEventListenerManager },
+  { &kNS_DOMEVENTGROUP_CID, false, NULL, CreateDOMEventGroup },
+  { &kNS_DOCUMENT_VIEWER_CID, false, NULL, CreateDocumentViewer },
+  { &kNS_HTMLDOCUMENT_CID, false, NULL, CreateHTMLDocument },
+  { &kNS_DOM_IMPLEMENTATION_CID, false, NULL, CreateDOMImplementation },
+  { &kNS_XMLDOCUMENT_CID, false, NULL, CreateXMLDocument },
+#ifdef MOZ_SVG
+  { &kNS_SVGDOCUMENT_CID, false, NULL, CreateSVGDocument },
 #endif
-
-  { "Canvas 2D Rendering Context",
-    NS_CANVASRENDERINGCONTEXT2D_CID,
-    "@mozilla.org/content/canvas-rendering-context;1?id=2d",
-    CreateCanvasRenderingContext2D },
-  { "Canvas WebGL Rendering Context",
-    NS_CANVASRENDERINGCONTEXTWEBGL_CID,
-    "@mozilla.org/content/canvas-rendering-context;1?id=moz-webgl",
-    CreateCanvasRenderingContextWebGL },
-  { "Canvas WebGL Rendering Context",
-    NS_CANVASRENDERINGCONTEXTWEBGL_CID,
-    "@mozilla.org/content/canvas-rendering-context;1?id=experimental-webgl",
-    CreateCanvasRenderingContextWebGL },
-
-
-  { "XML document encoder",
-    NS_TEXT_ENCODER_CID,
-    NS_DOC_ENCODER_CONTRACTID_BASE "text/xml",
-    CreateTextEncoder },
-
-  { "XML document encoder",
-    NS_TEXT_ENCODER_CID,
-    NS_DOC_ENCODER_CONTRACTID_BASE "application/xml",
-    CreateTextEncoder },
-
-  { "XHTML document encoder",
-    NS_TEXT_ENCODER_CID,
-    NS_DOC_ENCODER_CONTRACTID_BASE "application/xhtml+xml",
-    CreateTextEncoder },
-
-#ifdef MOZ_SVG
-  { "SVG document encoder",
-    NS_TEXT_ENCODER_CID,
-    NS_DOC_ENCODER_CONTRACTID_BASE "image/svg+xml",
-    CreateTextEncoder },
-#endif
-
-  { "HTML document encoder",
-    NS_TEXT_ENCODER_CID,
-    NS_DOC_ENCODER_CONTRACTID_BASE "text/html",
-    CreateTextEncoder },
-
-  { "Plaintext document encoder",
-    NS_TEXT_ENCODER_CID,
-    NS_DOC_ENCODER_CONTRACTID_BASE "text/plain",
-    CreateTextEncoder },
-
-  { "HTML copy encoder",
-    NS_HTMLCOPY_TEXT_ENCODER_CID,
-    NS_HTMLCOPY_ENCODER_CONTRACTID,
-    CreateHTMLCopyTextEncoder },
-
-  { "XML content serializer",
-    NS_XMLCONTENTSERIALIZER_CID,
-    NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/xml",
-    CreateXMLContentSerializer },
-
-  { "XML content serializer",
-    NS_XMLCONTENTSERIALIZER_CID,
-    NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/xml",
-    CreateXMLContentSerializer },
-
-  { "XHTML content serializer",
-    NS_XHTMLCONTENTSERIALIZER_CID,
-    NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/xhtml+xml",
-    CreateXHTMLContentSerializer },
-
-#ifdef MOZ_SVG
-  { "SVG content serializer",
-    NS_XMLCONTENTSERIALIZER_CID,
-    NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "image/svg+xml",
-    CreateXMLContentSerializer },
+  { &kNS_IMAGEDOCUMENT_CID, false, NULL, CreateImageDocument },
+  { &kNS_DOMSELECTION_CID, false, NULL, CreateDOMSelection },
+  { &kNS_FRAMESELECTION_CID, false, NULL, CreateSelection },
+  { &kNS_RANGE_CID, false, NULL, CreateRange },
+  { &kNS_RANGEUTILS_CID, false, NULL, CreateRangeUtils },
+  { &kNS_CONTENTITERATOR_CID, false, NULL, CreateContentIterator },
+  { &kNS_PRECONTENTITERATOR_CID, false, NULL, CreatePreContentIterator },
+  { &kNS_SUBTREEITERATOR_CID, false, NULL, CreateSubtreeIterator },
+  { &kNS_HTMLIMAGEELEMENT_CID, false, NULL, CreateHTMLImgElement },
+  { &kNS_HTMLOPTIONELEMENT_CID, false, NULL, CreateHTMLOptionElement },
+#ifdef MOZ_MEDIA
+  { &kNS_HTMLAUDIOELEMENT_CID, false, NULL, CreateHTMLAudioElement },
 #endif
-
-  { "HTML content serializer",
-    NS_HTMLCONTENTSERIALIZER_CID,
-    NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/html",
-    CreateHTMLContentSerializer },
-
-  { "XUL content serializer",
-    NS_XMLCONTENTSERIALIZER_CID,
-    NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/vnd.mozilla.xul+xml",
-    CreateXMLContentSerializer },
-
-  { "plaintext content serializer",
-    NS_PLAINTEXTSERIALIZER_CID,
-    NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/plain",
-    CreatePlainTextSerializer },
-
-  { "plaintext sink",
-    NS_PLAINTEXTSERIALIZER_CID,
-    NS_PLAINTEXTSINK_CONTRACTID,
-    CreatePlainTextSerializer },
-
-  { "html fragment sink",
-    NS_HTMLFRAGMENTSINK_CID,
-    NS_HTMLFRAGMENTSINK_CONTRACTID,
-    CreateHTMLFragmentSink },
-
-  { "html fragment sink 2",
-    NS_HTMLFRAGMENTSINK2_CID,
-    NS_HTMLFRAGMENTSINK2_CONTRACTID,
-    CreateHTMLFragmentSink2 },
-
-  { "html paranoid fragment sink",
-    NS_HTMLPARANOIDFRAGMENTSINK_CID,
-    NS_HTMLPARANOIDFRAGMENTSINK_CONTRACTID,
-    CreateHTMLParanoidFragmentSink },
-
-  { "HTML sanitizing content serializer",
-    MOZ_SANITIZINGHTMLSERIALIZER_CID,
-    MOZ_SANITIZINGHTMLSERIALIZER_CONTRACTID,
-    CreateSanitizingHTMLSerializer },
-
-  { "xml fragment sink",
-    NS_XMLFRAGMENTSINK_CID,
-    NS_XMLFRAGMENTSINK_CONTRACTID,
-    CreateXMLFragmentSink },
-
-  { "xml fragment sink 2",
-    NS_XMLFRAGMENTSINK2_CID,
-    NS_XMLFRAGMENTSINK2_CONTRACTID,
-    CreateXMLFragmentSink2 },
-
-  { "xhtml paranoid fragment sink",
-    NS_XHTMLPARANOIDFRAGMENTSINK_CID,
-    NS_XHTMLPARANOIDFRAGMENTSINK_CONTRACTID,
-    CreateXHTMLParanoidFragmentSink },
-
-  { "XBL Service",
-    NS_XBLSERVICE_CID,
-    "@mozilla.org/xbl;1",
-    CreateXBLService },
-
-  { "Content policy service",
-    NS_CONTENTPOLICY_CID,
-    NS_CONTENTPOLICY_CONTRACTID,
-    CreateContentPolicy },
-
-  { "Data document content policy",
-    NS_DATADOCUMENTCONTENTPOLICY_CID,
-    NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID,
-    nsDataDocumentContentPolicyConstructor,
-    RegisterDataDocumentContentPolicy,
-    UnregisterDataDocumentContentPolicy },
-
-  { "No data protocol content policy",
-    NS_NODATAPROTOCOLCONTENTPOLICY_CID,
-    NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID,
-    nsNoDataProtocolContentPolicyConstructor,
-    RegisterNoDataProtocolContentPolicy,
-    UnregisterNoDataProtocolContentPolicy },
-
-  { "XUL Controllers",
-    NS_XULCONTROLLERS_CID,
-    "@mozilla.org/xul/xul-controllers;1",
-    NS_NewXULControllers },
-
+  { &kNS_CANVASRENDERINGCONTEXT2D_CID, false, NULL, CreateCanvasRenderingContext2D },
+  { &kNS_CANVASRENDERINGCONTEXTWEBGL_CID, false, NULL, CreateCanvasRenderingContextWebGL },
+  { &kNS_TEXT_ENCODER_CID, false, NULL, CreateTextEncoder },
+  { &kNS_HTMLCOPY_TEXT_ENCODER_CID, false, NULL, CreateHTMLCopyTextEncoder },
+  { &kNS_XMLCONTENTSERIALIZER_CID, false, NULL, CreateXMLContentSerializer },
+  { &kNS_HTMLCONTENTSERIALIZER_CID, false, NULL, CreateHTMLContentSerializer },
+  { &kNS_XHTMLCONTENTSERIALIZER_CID, false, NULL, CreateXHTMLContentSerializer },
+  { &kNS_PLAINTEXTSERIALIZER_CID, false, NULL, CreatePlainTextSerializer },
+  { &kNS_HTMLFRAGMENTSINK_CID, false, NULL, CreateHTMLFragmentSink },
+  { &kNS_HTMLFRAGMENTSINK2_CID, false, NULL, CreateHTMLFragmentSink2 },
+  { &kNS_HTMLPARANOIDFRAGMENTSINK_CID, false, NULL, CreateHTMLParanoidFragmentSink },
+  { &kMOZ_SANITIZINGHTMLSERIALIZER_CID, false, NULL, CreateSanitizingHTMLSerializer },
+  { &kNS_XMLFRAGMENTSINK_CID, false, NULL, CreateXMLFragmentSink },
+  { &kNS_XMLFRAGMENTSINK2_CID, false, NULL, CreateXMLFragmentSink2 },
+  { &kNS_XHTMLPARANOIDFRAGMENTSINK_CID, false, NULL, CreateXHTMLParanoidFragmentSink },
+  { &kNS_XBLSERVICE_CID, false, NULL, CreateXBLService },
+  { &kNS_CONTENTPOLICY_CID, false, NULL, CreateContentPolicy },
+  { &kNS_DATADOCUMENTCONTENTPOLICY_CID, false, NULL, nsDataDocumentContentPolicyConstructor },
+  { &kNS_NODATAPROTOCOLCONTENTPOLICY_CID, false, NULL, nsNoDataProtocolContentPolicyConstructor },
+  { &kNS_XULCONTROLLERS_CID, false, NULL, NS_NewXULControllers },
 #ifdef MOZ_XUL
-  { "XUL Sort Service",
-    NS_XULSORTSERVICE_CID,
-    "@mozilla.org/xul/xul-sort-service;1",
-    CreateXULSortService },
-
-  { "XUL Template Builder",
-    NS_XULTEMPLATEBUILDER_CID,
-    "@mozilla.org/xul/xul-template-builder;1",
-    NS_NewXULContentBuilder },
-
-  { "XUL Tree Builder",
-    NS_XULTREEBUILDER_CID,
-    "@mozilla.org/xul/xul-tree-builder;1",
-    NS_NewXULTreeBuilder },
-
-  { "XUL Popup Manager",
-    NS_XULPOPUPMANAGER_CID,
-    "@mozilla.org/xul/xul-popup-manager;1",
-    CreateXULPopupManager },
-
-  { "XUL Document",
-    NS_XULDOCUMENT_CID,
-    "@mozilla.org/xul/xul-document;1",
-    CreateXULDocument },
-
-  { "XUL Prototype Cache",
-    NS_XULPROTOTYPECACHE_CID,
-    "@mozilla.org/xul/xul-prototype-cache;1",
-    NS_NewXULPrototypeCache },
-
+  { &kNS_XULSORTSERVICE_CID, false, NULL, CreateXULSortService },
+  { &kNS_XULTEMPLATEBUILDER_CID, false, NULL, NS_NewXULContentBuilder },
+  { &kNS_XULTREEBUILDER_CID, false, NULL, NS_NewXULTreeBuilder },
+  { &kNS_XULPOPUPMANAGER_CID, false, NULL, CreateXULPopupManager },
+  { &kNS_XULDOCUMENT_CID, false, NULL, CreateXULDocument },
+  { &kNS_XULPROTOTYPECACHE_CID, false, NULL, NS_NewXULPrototypeCache },
 #endif
-
 #ifdef MOZ_XTF
-  { "XTF Service",
-    NS_XTFSERVICE_CID,
-    NS_XTFSERVICE_CONTRACTID,
-    CreateXTFService },
-
-  { "XML Content Builder",
-    NS_XMLCONTENTBUILDER_CID,
-    NS_XMLCONTENTBUILDER_CONTRACTID,
-    CreateXMLContentBuilder },
+  { &kNS_XTFSERVICE_CID, false, NULL, CreateXTFService },
+  { &kNS_XMLCONTENTBUILDER_CID, false, NULL, CreateXMLContentBuilder },
 #endif
-
-  { "Document Loader Factory",
-    NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID,
-    CONTENT_DLF_CONTRACTID,
-    CreateContentDLF,
-    nsContentDLF::RegisterDocumentFactories,
-    nsContentDLF::UnregisterDocumentFactories },
-
-  { "Wyciwyg Handler",
-    NS_WYCIWYGPROTOCOLHANDLER_CID,
-    NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "wyciwyg",
-    nsWyciwygProtocolHandlerConstructor },
-
-  { "SyncLoad DOM Service",
-    NS_SYNCLOADDOMSERVICE_CID,
-    NS_SYNCLOADDOMSERVICE_CONTRACTID,
-    nsSyncLoadServiceConstructor },
-
-  // DOM objects
-  { "Script Object Factory",
-    NS_DOM_SCRIPT_OBJECT_FACTORY_CID,
-    nsnull,
-    nsDOMScriptObjectFactoryConstructor
-  },
-  { "Base DOM Exception",
-    NS_BASE_DOM_EXCEPTION_CID,
-    nsnull,
-    nsBaseDOMExceptionConstructor
-  },
-  { "JavaScript Protocol Handler",
-    NS_JSPROTOCOLHANDLER_CID,
-    NS_JSPROTOCOLHANDLER_CONTRACTID,
-    nsJSProtocolHandler::Create },
-  { "JavaScript URI",
-    NS_JSURI_CID,
-    nsnull,
-    nsJSURIConstructor },
-  { "Window Command Table",
-    NS_WINDOWCOMMANDTABLE_CID,
-    "",
-    CreateWindowCommandTableConstructor
-  },
-  { "Window Command Controller",
-    NS_WINDOWCONTROLLER_CID,
-    NS_WINDOWCONTROLLER_CONTRACTID,
-    CreateWindowControllerWithSingletonCommandTable
-  },
-
-  // view stuff
-  { "View Manager", NS_VIEW_MANAGER_CID, "@mozilla.org/view-manager;1",
-    nsViewManagerConstructor },
-
-  { "Plugin Document Loader Factory",
-    NS_PLUGINDOCLOADERFACTORY_CID,
-    PLUGIN_DLF_CONTRACTID,
-    CreateContentDLF },
-
-  { "Plugin Document",
-    NS_PLUGINDOCUMENT_CID,
-    nsnull,
-    CreatePluginDocument },
-
+  { &kNS_CONTENT_DOCUMENT_LOADER_FACTORY_CID, false, NULL },
+  { &kNS_WYCIWYGPROTOCOLHANDLER_CID, false, NULL, nsWyciwygProtocolHandlerConstructor },
+  { &kNS_SYNCLOADDOMSERVICE_CID, false, NULL, nsSyncLoadServiceConstructor },
+  { &kNS_DOM_SCRIPT_OBJECT_FACTORY_CID, false, NULL, nsDOMScriptObjectFactoryConstructor },
+  { &kNS_BASE_DOM_EXCEPTION_CID, false, NULL, nsBaseDOMExceptionConstructor },
+  { &kNS_JSPROTOCOLHANDLER_CID, false, NULL, nsJSProtocolHandler::Create },
+  { &kNS_JSURI_CID, false, NULL, nsJSURIConstructor },
+  { &kNS_WINDOWCOMMANDTABLE_CID, false, NULL, CreateWindowCommandTableConstructor },
+  { &kNS_WINDOWCONTROLLER_CID, false, NULL, CreateWindowControllerWithSingletonCommandTable },
+  { &kNS_VIEW_MANAGER_CID, false, NULL, nsViewManagerConstructor },
+  { &kNS_PLUGINDOCLOADERFACTORY_CID, false, NULL, CreateContentDLF },
+  { &kNS_PLUGINDOCUMENT_CID, false, NULL, CreatePluginDocument },
 #ifdef MOZ_MEDIA
-  { "Video Document",
-    NS_VIDEODOCUMENT_CID,
-    nsnull,
-    CreateVideoDocument },
+  { &kNS_VIDEODOCUMENT_CID, false, NULL, CreateVideoDocument },
 #endif
-
-  { "Style sheet service",
-    NS_STYLESHEETSERVICE_CID,
-    NS_STYLESHEETSERVICE_CONTRACTID,
-    nsStyleSheetServiceConstructor },
-
-  // transformiix
-
-  { "XSLTProcessor",
-    TRANSFORMIIX_XSLT_PROCESSOR_CID,
-    TRANSFORMIIX_XSLT_PROCESSOR_CONTRACTID,
-    txMozillaXSLTProcessorConstructor },
-
-  { "XPathEvaluator",
-    TRANSFORMIIX_XPATH_EVALUATOR_CID,
-    NS_XPATH_EVALUATOR_CONTRACTID,
-    nsXPathEvaluatorConstructor },
-
-  { "XPath1 XPointer Scheme Processor",
-    TRANSFORMIIX_XPATH1_SCHEME_CID,
-    NS_XPOINTER_SCHEME_PROCESSOR_BASE "xpath1",
-    nsXPath1SchemeProcessorConstructor },
-
-  { "Transformiix NodeSet",
-    TRANSFORMIIX_NODESET_CID,
-    TRANSFORMIIX_NODESET_CONTRACTID,
-    txNodeSetAdaptorConstructor },
-
-  { "XML Serializer",
-    NS_XMLSERIALIZER_CID,
-    NS_XMLSERIALIZER_CONTRACTID,
-    nsDOMSerializerConstructor },
-
-  { "FileReader",
-    NS_FILEREADER_CID,
-    NS_FILEREADER_CONTRACTID,
-    nsDOMFileReaderConstructor },
-
-  { "FormData",
-    NS_FORMDATA_CID,
-    NS_FORMDATA_CONTRACTID,
-    nsFormDataConstructor },
-
-  { "FileData Protocol Handler",
-    NS_FILEDATAPROTOCOLHANDLER_CID,
-    NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX FILEDATA_SCHEME,
-    nsFileDataProtocolHandlerConstructor },
-
-  { "XMLHttpRequest",
-    NS_XMLHTTPREQUEST_CID,
-    NS_XMLHTTPREQUEST_CONTRACTID,
-    nsXMLHttpRequestConstructor },
-
-  { "DOM Parser",
-    NS_DOMPARSER_CID,
-    NS_DOMPARSER_CONTRACTID,
-    nsDOMParserConstructor },
-
-  { "DOM Storage",
-    NS_DOMSTORAGE_CID,
-    "@mozilla.org/dom/storage;1",
-    NS_NewDOMStorage },
-
-  { "DOM Storage 2",
-    NS_DOMSTORAGE2_CID,
-    "@mozilla.org/dom/storage;2",
-    NS_NewDOMStorage2 },
-
-  { "DOM Storage Manager",
-    NS_DOMSTORAGEMANAGER_CID,
-    "@mozilla.org/dom/storagemanager;1",
-    nsDOMStorageManagerConstructor },
-
-  { "DOM JSON",
-    NS_DOMJSON_CID,
-    "@mozilla.org/dom/json;1",
-    NS_NewJSON },
-
-  { "Text Editor",
-    NS_TEXTEDITOR_CID,
-    "@mozilla.org/editor/texteditor;1",
-    nsPlaintextEditorConstructor },
-
+  { &kNS_STYLESHEETSERVICE_CID, false, NULL, nsStyleSheetServiceConstructor },
+  { &kTRANSFORMIIX_XSLT_PROCESSOR_CID, false, NULL, txMozillaXSLTProcessorConstructor },
+  { &kTRANSFORMIIX_XPATH_EVALUATOR_CID, false, NULL, nsXPathEvaluatorConstructor },
+  { &kTRANSFORMIIX_XPATH1_SCHEME_CID, false, NULL, nsXPath1SchemeProcessorConstructor },
+  { &kTRANSFORMIIX_NODESET_CID, false, NULL, txNodeSetAdaptorConstructor },
+  { &kNS_XMLSERIALIZER_CID, false, NULL, nsDOMSerializerConstructor },
+  { &kNS_FILEREADER_CID, false, NULL, nsDOMFileReaderConstructor },
+  { &kNS_FORMDATA_CID, false, NULL, nsFormDataConstructor },
+  { &kNS_FILEDATAPROTOCOLHANDLER_CID, false, NULL, nsFileDataProtocolHandlerConstructor },
+  { &kNS_XMLHTTPREQUEST_CID, false, NULL, nsXMLHttpRequestConstructor },
+  { &kNS_DOMPARSER_CID, false, NULL, nsDOMParserConstructor },
+  { &kNS_DOMSTORAGE_CID, false, NULL, NS_NewDOMStorage },
+  { &kNS_DOMSTORAGE2_CID, false, NULL, NS_NewDOMStorage2 },
+  { &kNS_DOMSTORAGEMANAGER_CID, false, NULL, nsDOMStorageManagerConstructor },
+  { &kNS_DOMJSON_CID, false, NULL, NS_NewJSON },
+  { &kNS_TEXTEDITOR_CID, false, NULL, nsPlaintextEditorConstructor },
 #ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
 #ifdef ENABLE_EDITOR_API_LOG
-    { "HTML Editor",
-      NS_HTMLEDITOR_CID,
-      "@mozilla.org/editor/htmleditor;1",
-      nsHTMLEditorLogConstructor },
+  { &kNS_HTMLEDITOR_CID, false, NULL, nsHTMLEditorLogConstructor },
 #else
-    { "HTML Editor",
-      NS_HTMLEDITOR_CID,
-      "@mozilla.org/editor/htmleditor;1",
-      nsHTMLEditorConstructor },
+  { &kNS_HTMLEDITOR_CID, false, NULL, nsHTMLEditorConstructor },
 #endif
 #endif
-
-    { "Editor Controller",
-      NS_EDITORCONTROLLER_CID,
-      "@mozilla.org/editor/editorcontroller;1",
-      nsEditorControllerConstructor },
-
-    { "Editor Command Table",
-      NS_EDITORCOMMANDTABLE_CID,
-      "",   // no point in using a contract ID
-      nsEditorCommandTableConstructor },
-
+  { &kNS_EDITORCONTROLLER_CID, false, NULL, nsEditorControllerConstructor },
+  { &kNS_EDITORCOMMANDTABLE_CID, false, NULL, nsEditorCommandTableConstructor },
 #ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
-    { NULL,
-      NS_TEXTSERVICESDOCUMENT_CID,
-      "@mozilla.org/textservices/textservicesdocument;1",
-      nsTextServicesDocumentConstructor },
+  { &kNS_TEXTSERVICESDOCUMENT_CID, false, NULL, nsTextServicesDocumentConstructor },
 #endif
-
-    { "Geolocation Service",
-      NS_GEOLOCATION_SERVICE_CID,
-      "@mozilla.org/geolocation/service;1",
-      nsGeolocationServiceConstructor },
-
-    { "Geolocation",
-      NS_GEOLOCATION_CID,
-      "@mozilla.org/geolocation;1",
-      nsGeolocationConstructor },
-
-    { "Focus Manager",
-      NS_FOCUSMANAGER_CID,
-      "@mozilla.org/focus-manager;1",
-      CreateFocusManager },
-
-    { "Content Utils",
-      NS_ICONTENTUTILS_CID,
-      "@mozilla.org/content/contentutils;1",
-      nsIContentUtilsConstructor },
-
-    { "Content Security Policy Service",
-      CSPSERVICE_CID,
-      CSPSERVICE_CONTRACTID,
-      CSPServiceConstructor,
-      CSPServiceRegistration,
-      CSPServiceUnregistration },
-
-    { "Event Listener Service",
-      NS_EVENTLISTENERSERVICE_CID,
-      NS_EVENTLISTENERSERVICE_CONTRACTID,
-      CreateEventListenerService },
-
-    { "Global Message Manager",
-      NS_GLOBALMESSAGEMANAGER_CID,
-      NS_GLOBALMESSAGEMANAGER_CONTRACTID,
-      CreateGlobalMessageManager },
-
-    { "Channel Policy",
-      NSCHANNELPOLICY_CID,
-      NSCHANNELPOLICY_CONTRACTID,
-      nsChannelPolicyConstructor }
-};
-
-static nsModuleInfo const kLayoutModuleInfo = {
-    NS_MODULEINFO_VERSION,
-    "nsLayoutModule",
-    gLayoutComponents,
-    (sizeof(gLayoutComponents) / sizeof(gLayoutComponents[0])),
-    Initialize,
-    nsnull
+  { &kNS_GEOLOCATION_SERVICE_CID, false, NULL, nsGeolocationServiceConstructor },
+  { &kNS_GEOLOCATION_CID, false, NULL, nsGeolocationConstructor },
+  { &kNS_FOCUSMANAGER_CID, false, NULL, CreateFocusManager },
+  { &kNS_ICONTENTUTILS_CID, false, NULL, nsIContentUtilsConstructor },
+  { &kCSPSERVICE_CID, false, NULL, CSPServiceConstructor },
+  { &kNS_EVENTLISTENERSERVICE_CID, false, NULL, CreateEventListenerService },
+  { &kNSCHANNELPOLICY_CID, false, NULL, nsChannelPolicyConstructor },
+  { &kNS_SCRIPTSECURITYMANAGER_CID, false, NULL, Construct_nsIScriptSecurityManager },
+  { &kNS_PRINCIPAL_CID, false, NULL, nsPrincipalConstructor },
+  { &kNS_SYSTEMPRINCIPAL_CID, false, NULL, nsSystemPrincipalConstructor },
+  { &kNS_NULLPRINCIPAL_CID, false, NULL, nsNullPrincipalConstructor },
+  { &kNS_SECURITYNAMESET_CID, false, NULL, nsSecurityNameSetConstructor },
+  { NULL }
 };
 
-static const nsModuleComponentInfo gXPConnectComponents[] = {
-    XPCONNECT_COMPONENTS,
-
-    { NS_SCRIPTSECURITYMANAGER_CLASSNAME, 
-      NS_SCRIPTSECURITYMANAGER_CID, 
-      NS_SCRIPTSECURITYMANAGER_CONTRACTID,
-      Construct_nsIScriptSecurityManager,
-      RegisterSecurityNameSet,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsIClassInfo::MAIN_THREAD_ONLY
-    },
-
-    { NS_SCRIPTSECURITYMANAGER_CLASSNAME,
-      NS_SCRIPTSECURITYMANAGER_CID,
-      NS_GLOBAL_CHANNELEVENTSINK_CONTRACTID,
-      Construct_nsIScriptSecurityManager,
-      RegisterSecurityNameSet,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsIClassInfo::MAIN_THREAD_ONLY
-    },
-
-
-
-    { NS_PRINCIPAL_CLASSNAME, 
-      NS_PRINCIPAL_CID, 
-      NS_PRINCIPAL_CONTRACTID,
-      nsPrincipalConstructor,
-      nsnull,
-      nsnull,
-      nsnull,
-      NS_CI_INTERFACE_GETTER_NAME(nsPrincipal),
-      nsnull,
-      &NS_CLASSINFO_NAME(nsPrincipal),
-      nsIClassInfo::MAIN_THREAD_ONLY | nsIClassInfo::EAGER_CLASSINFO
-    },
-
-    { NS_SYSTEMPRINCIPAL_CLASSNAME, 
-      NS_SYSTEMPRINCIPAL_CID, 
-      NS_SYSTEMPRINCIPAL_CONTRACTID,
-      nsSystemPrincipalConstructor,
-      nsnull,
-      nsnull,
-      nsnull,
-      NS_CI_INTERFACE_GETTER_NAME(nsSystemPrincipal),
-      nsnull,
-      &NS_CLASSINFO_NAME(nsSystemPrincipal),
-      nsIClassInfo::SINGLETON | nsIClassInfo::MAIN_THREAD_ONLY |
-      nsIClassInfo::EAGER_CLASSINFO
-    },
-
-    { NS_NULLPRINCIPAL_CLASSNAME, 
-      NS_NULLPRINCIPAL_CID, 
-      NS_NULLPRINCIPAL_CONTRACTID,
-      nsNullPrincipalConstructor,
-      nsnull,
-      nsnull,
-      nsnull,
-      NS_CI_INTERFACE_GETTER_NAME(nsNullPrincipal),
-      nsnull,
-      &NS_CLASSINFO_NAME(nsNullPrincipal),
-      nsIClassInfo::MAIN_THREAD_ONLY | nsIClassInfo::EAGER_CLASSINFO
-    },
-
-    { "Security Script Name Set",
-      NS_SECURITYNAMESET_CID,
-      NS_SECURITYNAMESET_CONTRACTID,
-      nsSecurityNameSetConstructor,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsnull,
-      nsIClassInfo::MAIN_THREAD_ONLY
-    }
+static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
+  XPCONNECT_CONTRACTS
+  { "@mozilla.org/layout/xul-boxobject;1", &kNS_BOXOBJECT_CID },
+#ifdef MOZ_XUL
+  { "@mozilla.org/layout/xul-boxobject-listbox;1", &kNS_LISTBOXOBJECT_CID },
+  { "@mozilla.org/layout/xul-boxobject-menu;1", &kNS_MENUBOXOBJECT_CID },
+  { "@mozilla.org/layout/xul-boxobject-popup;1", &kNS_POPUPBOXOBJECT_CID },
+  { "@mozilla.org/layout/xul-boxobject-container;1", &kNS_CONTAINERBOXOBJECT_CID },
+  { "@mozilla.org/layout/xul-boxobject-scrollbox;1", &kNS_SCROLLBOXOBJECT_CID },
+  { "@mozilla.org/layout/xul-boxobject-tree;1", &kNS_TREEBOXOBJECT_CID },
+#endif // MOZ_XUL
+#ifndef MOZ_NO_INSPECTOR_APIS
+#ifdef MOZ_XUL
+  { "@mozilla.org/inspector/dom-view;1", &kIN_DOMVIEW_CID },
+#endif
+  { "@mozilla.org/inspector/deep-tree-walker;1", &kIN_DEEPTREEWALKER_CID },
+  { "@mozilla.org/inspector/flasher;1", &kIN_FLASHER_CID },
+  { "@mozilla.org/inspector/search;1?type=cssvalue", &kIN_CSSVALUESEARCH_CID },
+  { "@mozilla.org/inspector/dom-utils;1", &kIN_DOMUTILS_CID },
+#endif // MOZ_NO_INSPECTOR_APIS
+  { NS_NAMESPACEMANAGER_CONTRACTID, &kNS_NAMESPACEMANAGER_CID },
+  { "@mozilla.org/xml/xml-document;1", &kNS_XMLDOCUMENT_CID },
+#ifdef MOZ_SVG
+  { "@mozilla.org/svg/svg-document;1", &kNS_SVGDOCUMENT_CID },
+#endif
+  { "@mozilla.org/content/dom-selection;1", &kNS_DOMSELECTION_CID },
+  { "@mozilla.org/content/range;1", &kNS_RANGE_CID },
+  { "@mozilla.org/content/range-utils;1", &kNS_RANGEUTILS_CID },
+  { "@mozilla.org/content/post-content-iterator;1", &kNS_CONTENTITERATOR_CID },
+  { "@mozilla.org/content/pre-content-iterator;1", &kNS_PRECONTENTITERATOR_CID },
+  { "@mozilla.org/content/subtree-content-iterator;1", &kNS_SUBTREEITERATOR_CID },
+  { NS_HTMLIMGELEMENT_CONTRACTID, &kNS_HTMLIMAGEELEMENT_CID },
+  { NS_HTMLOPTIONELEMENT_CONTRACTID, &kNS_HTMLOPTIONELEMENT_CID },
+#ifdef MOZ_MEDIA
+  { NS_HTMLAUDIOELEMENT_CONTRACTID, &kNS_HTMLAUDIOELEMENT_CID },
+#endif
+  { "@mozilla.org/content/canvas-rendering-context;1?id=2d", &kNS_CANVASRENDERINGCONTEXT2D_CID },
+  { "@mozilla.org/content/canvas-rendering-context;1?id=moz-webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
+  { "@mozilla.org/content/canvas-rendering-context;1?id=experimental-webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
+  { NS_DOC_ENCODER_CONTRACTID_BASE "text/xml", &kNS_TEXT_ENCODER_CID },
+  { NS_DOC_ENCODER_CONTRACTID_BASE "application/xml", &kNS_TEXT_ENCODER_CID },
+  { NS_DOC_ENCODER_CONTRACTID_BASE "application/xhtml+xml", &kNS_TEXT_ENCODER_CID },
+#ifdef MOZ_SVG
+  { NS_DOC_ENCODER_CONTRACTID_BASE "image/svg+xml", &kNS_TEXT_ENCODER_CID },
+#endif
+  { NS_DOC_ENCODER_CONTRACTID_BASE "text/html", &kNS_TEXT_ENCODER_CID },
+  { NS_DOC_ENCODER_CONTRACTID_BASE "text/plain", &kNS_TEXT_ENCODER_CID },
+  { NS_HTMLCOPY_ENCODER_CONTRACTID, &kNS_HTMLCOPY_TEXT_ENCODER_CID },
+  { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/xml", &kNS_XMLCONTENTSERIALIZER_CID },
+  { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/xml", &kNS_XMLCONTENTSERIALIZER_CID },
+  { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/xhtml+xml", &kNS_XHTMLCONTENTSERIALIZER_CID },
+#ifdef MOZ_SVG
+  { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "image/svg+xml", &kNS_XMLCONTENTSERIALIZER_CID },
+#endif
+  { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/html", &kNS_HTMLCONTENTSERIALIZER_CID },
+  { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/vnd.mozilla.xul+xml", &kNS_XMLCONTENTSERIALIZER_CID },
+  { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/plain", &kNS_PLAINTEXTSERIALIZER_CID },
+  { NS_PLAINTEXTSINK_CONTRACTID, &kNS_PLAINTEXTSERIALIZER_CID },
+  { NS_HTMLFRAGMENTSINK_CONTRACTID, &kNS_HTMLFRAGMENTSINK_CID },
+  { NS_HTMLFRAGMENTSINK2_CONTRACTID, &kNS_HTMLFRAGMENTSINK2_CID },
+  { NS_HTMLPARANOIDFRAGMENTSINK_CONTRACTID, &kNS_HTMLPARANOIDFRAGMENTSINK_CID },
+  { MOZ_SANITIZINGHTMLSERIALIZER_CONTRACTID, &kMOZ_SANITIZINGHTMLSERIALIZER_CID },
+  { NS_XMLFRAGMENTSINK_CONTRACTID, &kNS_XMLFRAGMENTSINK_CID },
+  { NS_XMLFRAGMENTSINK2_CONTRACTID, &kNS_XMLFRAGMENTSINK2_CID },
+  { NS_XHTMLPARANOIDFRAGMENTSINK_CONTRACTID, &kNS_XHTMLPARANOIDFRAGMENTSINK_CID },
+  { "@mozilla.org/xbl;1", &kNS_XBLSERVICE_CID },
+  { NS_CONTENTPOLICY_CONTRACTID, &kNS_CONTENTPOLICY_CID },
+  { NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID, &kNS_DATADOCUMENTCONTENTPOLICY_CID },
+  { NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID, &kNS_NODATAPROTOCOLCONTENTPOLICY_CID },
+  { "@mozilla.org/xul/xul-controllers;1", &kNS_XULCONTROLLERS_CID },
+#ifdef MOZ_XUL
+  { "@mozilla.org/xul/xul-sort-service;1", &kNS_XULSORTSERVICE_CID },
+  { "@mozilla.org/xul/xul-template-builder;1", &kNS_XULTEMPLATEBUILDER_CID },
+  { "@mozilla.org/xul/xul-tree-builder;1", &kNS_XULTREEBUILDER_CID },
+  { "@mozilla.org/xul/xul-popup-manager;1", &kNS_XULPOPUPMANAGER_CID },
+  { "@mozilla.org/xul/xul-document;1", &kNS_XULDOCUMENT_CID },
+  { "@mozilla.org/xul/xul-prototype-cache;1", &kNS_XULPROTOTYPECACHE_CID },
+#endif
+#ifdef MOZ_XTF
+  { NS_XTFSERVICE_CONTRACTID, &kNS_XTFSERVICE_CID },
+  { NS_XMLCONTENTBUILDER_CONTRACTID, &kNS_XMLCONTENTBUILDER_CID },
+#endif
+  { CONTENT_DLF_CONTRACTID, &kNS_CONTENT_DOCUMENT_LOADER_FACTORY_CID },
+  { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "wyciwyg", &kNS_WYCIWYGPROTOCOLHANDLER_CID },
+  { NS_SYNCLOADDOMSERVICE_CONTRACTID, &kNS_SYNCLOADDOMSERVICE_CID },
+  { NS_JSPROTOCOLHANDLER_CONTRACTID, &kNS_JSPROTOCOLHANDLER_CID },
+  { NS_WINDOWCONTROLLER_CONTRACTID, &kNS_WINDOWCONTROLLER_CID },
+  { "@mozilla.org/view-manager;1", &kNS_VIEW_MANAGER_CID },
+  { PLUGIN_DLF_CONTRACTID, &kNS_PLUGINDOCLOADERFACTORY_CID },
+  { NS_STYLESHEETSERVICE_CONTRACTID, &kNS_STYLESHEETSERVICE_CID },
+  { TRANSFORMIIX_XSLT_PROCESSOR_CONTRACTID, &kTRANSFORMIIX_XSLT_PROCESSOR_CID },
+  { NS_XPATH_EVALUATOR_CONTRACTID, &kTRANSFORMIIX_XPATH_EVALUATOR_CID },
+  { NS_XPOINTER_SCHEME_PROCESSOR_BASE "xpath1", &kTRANSFORMIIX_XPATH1_SCHEME_CID },
+  { TRANSFORMIIX_NODESET_CONTRACTID, &kTRANSFORMIIX_NODESET_CID },
+  { NS_XMLSERIALIZER_CONTRACTID, &kNS_XMLSERIALIZER_CID },
+  { NS_FILEREADER_CONTRACTID, &kNS_FILEREADER_CID },
+  { NS_FORMDATA_CONTRACTID, &kNS_FORMDATA_CID },
+  { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX FILEDATA_SCHEME, &kNS_FILEDATAPROTOCOLHANDLER_CID },
+  { NS_XMLHTTPREQUEST_CONTRACTID, &kNS_XMLHTTPREQUEST_CID },
+  { NS_DOMPARSER_CONTRACTID, &kNS_DOMPARSER_CID },
+  { "@mozilla.org/dom/storage;1", &kNS_DOMSTORAGE_CID },
+  { "@mozilla.org/dom/storage;2", &kNS_DOMSTORAGE2_CID },
+  { "@mozilla.org/dom/storagemanager;1", &kNS_DOMSTORAGEMANAGER_CID },
+  { "@mozilla.org/dom/json;1", &kNS_DOMJSON_CID },
+  { "@mozilla.org/editor/texteditor;1", &kNS_TEXTEDITOR_CID },
+#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
+#ifdef ENABLE_EDITOR_API_LOG
+  { "@mozilla.org/editor/htmleditor;1", &kNS_HTMLEDITOR_CID },
+#else
+  { "@mozilla.org/editor/htmleditor;1", &kNS_HTMLEDITOR_CID },
+#endif
+#endif
+  { "@mozilla.org/editor/editorcontroller;1", &kNS_EDITORCONTROLLER_CID },
+  { "", &kNS_EDITORCOMMANDTABLE_CID },
+#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
+  { "@mozilla.org/textservices/textservicesdocument;1", &kNS_TEXTSERVICESDOCUMENT_CID },
+#endif
+  { "@mozilla.org/geolocation/service;1", &kNS_GEOLOCATION_SERVICE_CID },
+  { "@mozilla.org/geolocation;1", &kNS_GEOLOCATION_CID },
+  { "@mozilla.org/focus-manager;1", &kNS_FOCUSMANAGER_CID },
+  { "@mozilla.org/content/contentutils;1", &kNS_ICONTENTUTILS_CID },
+  { CSPSERVICE_CONTRACTID, &kCSPSERVICE_CID },
+  { NS_EVENTLISTENERSERVICE_CONTRACTID, &kNS_EVENTLISTENERSERVICE_CID },
+  { NSCHANNELPOLICY_CONTRACTID, &kNSCHANNELPOLICY_CID },
+  { NS_SCRIPTSECURITYMANAGER_CONTRACTID, &kNS_SCRIPTSECURITYMANAGER_CID },
+  { NS_GLOBAL_CHANNELEVENTSINK_CONTRACTID, &kNS_SCRIPTSECURITYMANAGER_CID },
+  { NS_PRINCIPAL_CONTRACTID, &kNS_PRINCIPAL_CID },
+  { NS_SYSTEMPRINCIPAL_CONTRACTID, &kNS_SYSTEMPRINCIPAL_CID },
+  { NS_NULLPRINCIPAL_CONTRACTID, &kNS_NULLPRINCIPAL_CID },
+  { NS_SECURITYNAMESET_CONTRACTID, &kNS_SECURITYNAMESET_CID },
+  { NULL }
 };
 
-void
-XPConnectModuleDtor(nsIModule *self)
+static const mozilla::Module::CategoryEntry kLayoutCategories[] = {
+  XPCONNECT_CATEGORIES
+  { JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY, "Image", NS_HTMLIMGELEMENT_CONTRACTID },
+  { JAVASCRIPT_GLOBAL_CONSTRUCTOR_PROTO_ALIAS_CATEGORY, "Image", "HTMLImageElement" },
+  { JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY, "Option", NS_HTMLOPTIONELEMENT_CONTRACTID },
+  { JAVASCRIPT_GLOBAL_CONSTRUCTOR_PROTO_ALIAS_CATEGORY, "Option", "HTMLOptionElement" },
+#ifdef MOZ_MEDIA
+  { JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY, "Audio", NS_HTMLAUDIOELEMENT_CONTRACTID },
+  { JAVASCRIPT_GLOBAL_CONSTRUCTOR_PROTO_ALIAS_CATEGORY, "Audio", "HTMLAudioElement" },
+#endif
+  { "content-policy", NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID, NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID },
+  { "content-policy", NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID, NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID },
+  { "content-policy", "CSPService", CSPSERVICE_CONTRACTID },
+  { "net-channel-event-sinks", "CSPService", CSPSERVICE_CONTRACTID },
+  { JAVASCRIPT_GLOBAL_STATIC_NAMESET_CATEGORY, "PrivilegeManager", NS_SECURITYNAMESET_CONTRACTID },
+  { "app-startup", "Script Security Manager", "service," NS_SCRIPTSECURITYMANAGER_CONTRACTID },
+  CONTENTDLF_CATEGORIES
+  { NULL }
+};
+
+static void
+LayoutModuleDtor()
 {
-  xpcModuleDtor(self);
+  xpcModuleDtor();
 
   nsScriptSecurityManager::Shutdown();
 }
 
-static nsModuleInfo const kXPConnectModuleInfo = {
-    NS_MODULEINFO_VERSION,
-    "XPConnectModule",
-    gXPConnectComponents,
-    (sizeof(gXPConnectComponents) / sizeof(gXPConnectComponents[0])),
-    xpcModuleCtor,
-    XPConnectModuleDtor
+static const mozilla::Module kLayoutModule = {
+  mozilla::Module::kVersion,
+  kLayoutCIDs,
+  kLayoutContracts,
+  kLayoutCategories,
+  NULL,
+  Initialize,
+  LayoutModuleDtor
 };
-
-// XPConnect is initialized early, because it has an XPCOM component loader.
-// Initializing nsLayoutStatics at that point leads to recursive initialization,
-// because it instantiates a bunch of other components. To get around that we
-// use two nsGenericModules, each with their own initialiser. nsLayoutStatics is
-// initialized for the module for layout components, but not for the module for
-// XPConnect components. nsLayoutModule forwards to the two nsGenericModules.
-class nsLayoutModule : public nsIModule
-{
-public:
-  nsLayoutModule(nsIModule *aXPConnectModule, nsIModule *aLayoutModule)
-    : mXPConnectModule(aXPConnectModule),
-      mLayoutModule(aLayoutModule)
-  {
-  }
-
-  NS_DECL_ISUPPORTS
-
-  // nsIModule
-  NS_SCRIPTABLE NS_IMETHOD GetClassObject(nsIComponentManager *aCompMgr,
-                                          const nsCID & aClass,
-                                          const nsIID & aIID,
-                                          void **aResult NS_OUTPARAM)
-  {
-    nsresult rv = mXPConnectModule->GetClassObject(aCompMgr, aClass, aIID,
-                                                   aResult);
-    if (rv == NS_ERROR_FACTORY_NOT_REGISTERED) {
-      rv = mLayoutModule->GetClassObject(aCompMgr, aClass, aIID, aResult);
-    }
-    return rv;
-  }
-  NS_SCRIPTABLE NS_IMETHOD RegisterSelf(nsIComponentManager *aCompMgr,
-                                        nsIFile *aLocation,
-                                        const char *aLoaderStr,
-                                        const char *aType)
-  {
-    nsresult rv = mXPConnectModule->RegisterSelf(aCompMgr, aLocation,
-                                                 aLoaderStr, aType);
-    if (NS_SUCCEEDED(rv)) {
-      rv = mLayoutModule->RegisterSelf(aCompMgr, aLocation, aLoaderStr, aType);
-    }
-    return rv;
-  }
-  NS_SCRIPTABLE NS_IMETHOD UnregisterSelf(nsIComponentManager *aCompMgr,
-                                          nsIFile *aLocation,
-                                          const char *aLoaderStr)
-  {
-    nsresult rv = mXPConnectModule->UnregisterSelf(aCompMgr, aLocation,
-                                                   aLoaderStr);
-    if (NS_SUCCEEDED(rv)) {
-      rv = mLayoutModule->UnregisterSelf(aCompMgr, aLocation, aLoaderStr);
-    }
-    return rv;
-  }
-  NS_SCRIPTABLE NS_IMETHOD CanUnload(nsIComponentManager *aCompMgr,
-                                     PRBool *aResult NS_OUTPARAM)
-  {
-    nsresult rv = mXPConnectModule->CanUnload(aCompMgr, aResult);
-    if (NS_SUCCEEDED(rv)) {
-      rv = mLayoutModule->CanUnload(aCompMgr, aResult);
-    }
-    return rv;
-  }
-
-private:
-  nsCOMPtr<nsIModule> mXPConnectModule;
-  nsCOMPtr<nsIModule> mLayoutModule;
-};
-
-NS_IMPL_ISUPPORTS1(nsLayoutModule, nsIModule)
-
-NSGETMODULE_ENTRY_POINT(nsLayoutModule)(nsIComponentManager *aServMgr,
-                                        nsIFile *aLocation,
-                                        nsIModule **aResult)
-{
-    nsCOMPtr<nsIModule> xpconnectModule;
-    nsresult rv = NS_NewGenericModule2(&kXPConnectModuleInfo,
-                                       getter_AddRefs(xpconnectModule));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIModule> layoutModule;
-    rv = NS_NewGenericModule2(&kLayoutModuleInfo, getter_AddRefs(layoutModule));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    NS_ADDREF(*aResult = new nsLayoutModule(xpconnectModule, layoutModule));
-
-    return NS_OK;
-}
+  
+NSMODULE_DEFN(nsLayoutModule) = &kLayoutModule;