diff --git a/mozilla/htmlparser/robot/test/RobotMain.cpp b/mozilla/htmlparser/robot/test/RobotMain.cpp
index f8d406ae54a..a5d4cade6d6 100644
--- a/mozilla/htmlparser/robot/test/RobotMain.cpp
+++ b/mozilla/htmlparser/robot/test/RobotMain.cpp
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
   }
 
   static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
-  nsRepository::RegisterFactory(kCParserCID, PARSER_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
 
   return DebugRobot(gWorkList, nsnull);
 }
diff --git a/mozilla/htmlparser/src/SelfTest.cpp b/mozilla/htmlparser/src/SelfTest.cpp
index c7a8cd358ec..9e737675287 100644
--- a/mozilla/htmlparser/src/SelfTest.cpp
+++ b/mozilla/htmlparser/src/SelfTest.cpp
@@ -203,7 +203,7 @@ int main(int argc, char* argv [])
   else _getcwd(buffer,_MAX_PATH);
 
   static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
-  nsRepository::RegisterFactory(kCParserCID, PARSER_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
 
   walkDirectoryTree(buffer);
   return 0;
diff --git a/mozilla/htmlparser/tests/logparse/logparse.cpp b/mozilla/htmlparser/tests/logparse/logparse.cpp
index ea4ef48a20c..077fef30ddc 100644
--- a/mozilla/htmlparser/tests/logparse/logparse.cpp
+++ b/mozilla/htmlparser/tests/logparse/logparse.cpp
@@ -44,8 +44,8 @@ static NS_DEFINE_IID(kILoggingSinkIID, NS_ILOGGING_SINK_IID);
 
 static void SetupRegistry()
 {
-  nsRepository::RegisterFactory(kParserCID, PARSER_DLL, PR_FALSE, PR_FALSE);
-  nsRepository::RegisterFactory(kLoggingSinkCID, PARSER_DLL,PR_FALSE,PR_FALSE);
+  nsRepository::RegisterComponent(kParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kLoggingSinkCID, NULL, NULL, PARSER_DLL,PR_FALSE,PR_FALSE);
 }
 
 //----------------------------------------------------------------------
diff --git a/mozilla/layout/html/tests/TestCSSParser.cpp b/mozilla/layout/html/tests/TestCSSParser.cpp
index 4ac5111a8f7..60057c7b898 100644
--- a/mozilla/layout/html/tests/TestCSSParser.cpp
+++ b/mozilla/layout/html/tests/TestCSSParser.cpp
@@ -56,8 +56,8 @@ static void Usage(void)
 
 int main(int argc, char** argv)
 {
-  nsRepository::RegisterFactory(kEventQueueServiceCID, XPCOM_DLL, PR_FALSE, PR_FALSE);
-  nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE);
 
   nsresult rv;
   PRBool verbose = PR_FALSE;
diff --git a/mozilla/parser/htmlparser/robot/test/RobotMain.cpp b/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
index f8d406ae54a..a5d4cade6d6 100644
--- a/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
+++ b/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
   }
 
   static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
-  nsRepository::RegisterFactory(kCParserCID, PARSER_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
 
   return DebugRobot(gWorkList, nsnull);
 }
diff --git a/mozilla/parser/htmlparser/src/SelfTest.cpp b/mozilla/parser/htmlparser/src/SelfTest.cpp
index c7a8cd358ec..9e737675287 100644
--- a/mozilla/parser/htmlparser/src/SelfTest.cpp
+++ b/mozilla/parser/htmlparser/src/SelfTest.cpp
@@ -203,7 +203,7 @@ int main(int argc, char* argv [])
   else _getcwd(buffer,_MAX_PATH);
 
   static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
-  nsRepository::RegisterFactory(kCParserCID, PARSER_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
 
   walkDirectoryTree(buffer);
   return 0;
diff --git a/mozilla/parser/htmlparser/tests/logparse/logparse.cpp b/mozilla/parser/htmlparser/tests/logparse/logparse.cpp
index ea4ef48a20c..077fef30ddc 100644
--- a/mozilla/parser/htmlparser/tests/logparse/logparse.cpp
+++ b/mozilla/parser/htmlparser/tests/logparse/logparse.cpp
@@ -44,8 +44,8 @@ static NS_DEFINE_IID(kILoggingSinkIID, NS_ILOGGING_SINK_IID);
 
 static void SetupRegistry()
 {
-  nsRepository::RegisterFactory(kParserCID, PARSER_DLL, PR_FALSE, PR_FALSE);
-  nsRepository::RegisterFactory(kLoggingSinkCID, PARSER_DLL,PR_FALSE,PR_FALSE);
+  nsRepository::RegisterComponent(kParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kLoggingSinkCID, NULL, NULL, PARSER_DLL,PR_FALSE,PR_FALSE);
 }
 
 //----------------------------------------------------------------------