Convert over to module from factory

git-svn-id: svn://10.0.0.236/trunk@49453 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/intl/chardet/src/Makefile.in

@@ -29,7 +29,7 @@ IS_COMPONENT	= 1
 REQUIRES	= libxpcom
 
 CPPSRCS		= \
-		nsCharDetDll.cpp \
+		nsCharDetModule.cpp \
 		nsObserverBase.cpp \
 		nsXMLEncodingObserver.cpp \
 		nsMetaCharsetObserver.cpp \

mozilla/intl/chardet/src/makefile.win

@@ -32,7 +32,7 @@ CSRCS= \
 	$(NULL)
 
 CPPSRCS= \
-         nsCharDetDll.cpp \
+         nsCharDetModule.cpp \
          nsMetaCharsetObserver.cpp \
          nsXMLEncodingObserver.cpp \
          nsObserverBase.cpp \
@@ -43,7 +43,7 @@ CPPSRCS= \
 	$(NULL)
 
 CPP_OBJS= \
-        .\$(OBJDIR)\nsCharDetDll.obj \
+        .\$(OBJDIR)\nsCharDetModule.obj \
         .\$(OBJDIR)\nsMetaCharsetObserver.obj \
         .\$(OBJDIR)\nsXMLEncodingObserver.obj \
         .\$(OBJDIR)\nsObserverBase.obj \

mozilla/intl/chardet/src/nsCharDetModule.cpp

@@ -15,11 +15,11 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-#include "nsCOMPtr.h"
-#include "nsIModule.h"
 #define NS_IMPL_IDS
 #include "nsICharsetAlias.h"
 #undef NS_IMPL_IDS
+#include "nsCOMPtr.h"
+#include "nsIModule.h"
 
 #include "pratom.h"
 #include "nsCharDetDll.h"
@@ -308,7 +308,7 @@ nsCharDetModule::RegisterSelf(nsIComponentManager *aCompMgr,
   }
 
   // get the registry
-  nsIRegistry::Key key;
+  nsRegistryKey key;
   nsIRegistry* registry;
   rv = nsServiceManager::GetService(NS_REGISTRY_PROGID,
                                     nsIRegistry::GetIID(),