Removing pref and ifndef necko dlls from registration.

webshell/tests/viewer/nsSetupRegistry.cpp

@@ -18,7 +18,6 @@
  */
 #define NS_IMPL_IDS
 #include "nsCOMPtr.h"
-#include "nsIPref.h"
 #include "nsIComponentManager.h"
 #include "nsWidgetsCID.h"
 #include "nsViewsCID.h"
@@ -30,11 +29,6 @@
 
 #include "nsParserCIID.h"
 #include "nsDOMCID.h"
-#ifndef NECKO
-#include "nsINetService.h"
-#else
-#include "nsIIOService.h"
-#endif // NECKO
 #ifdef OJI
 #include "nsILiveconnect.h"
 #include "nsIJVMManager.h"
@@ -67,14 +61,8 @@
     #define GFXWIN_DLL "raptorgfxwin.dll"
     #define VIEW_DLL   "raptorview.dll"
     #define WEB_DLL    "raptorweb.dll"
-    #define PREF_DLL   "xppref32.dll"
     #define PARSER_DLL "raptorhtmlpars.dll"
     #define DOM_DLL    "jsdom.dll"
-#ifdef NECKO
-    #define NECKO_DLL "necko.dll"
-#else
-    #define NETLIB_DLL "netlib.dll"
-#endif // NECKO
     #define PLUGIN_DLL "raptorplugin.dll"
     #define CAPS_DLL   "caps.dll"
     #define LIVECONNECT_DLL    "jsj3250.dll"
@@ -84,14 +72,8 @@
     #define GFXWIN_DLL    "GFXWIN_DLL"
     #define VIEW_DLL        "VIEW_DLL"
     #define WEB_DLL            "WEB_DLL"
-    #define PREF_DLL        "PREF_DLL"
     #define PARSER_DLL    "PARSER_DLL"
     #define DOM_DLL        "DOM_DLL"
-#ifdef NECKO
-    #define NECKO_DLL "NECKO_DLL"
-#else
-    #define NETLIB_DLL    "NETLIB_DLL"
-#endif // NECKO
     #define PLUGIN_DLL    "PLUGIN_DLL"
     #define CAPS_DLL    "CAPS_DLL"
     #define LIVECONNECT_DLL "LIVECONNECT_DLL"
@@ -109,14 +91,8 @@
     #endif
     #define VIEW_DLL   "libraptorview"MOZ_DLL_SUFFIX
     #define WEB_DLL    "libraptorwebwidget"MOZ_DLL_SUFFIX
-    #define PREF_DLL   "libpref"MOZ_DLL_SUFFIX
     #define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
     #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
-#ifdef NECKO
-    #define NECKO_DLL "libnecko"MOZ_DLL_SUFFIX
-#else
-    #define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
-#endif // NECKO
     #define PLUGIN_DLL "libraptorplugin"MOZ_DLL_SUFFIX
     #define CAPS_DLL   "libcaps"MOZ_DLL_SUFFIX
     #define LIVECONNECT_DLL "libliveconnect"MOZ_DLL_SUFFIX
@@ -179,9 +155,6 @@ static NS_DEFINE_IID(kCScrollingViewCID, NS_SCROLLING_VIEW_CID);
 static NS_DEFINE_IID(kCWebShellCID, NS_WEB_SHELL_CID);
 static NS_DEFINE_IID(kCDocLoaderServiceCID, NS_DOCUMENTLOADER_SERVICE_CID);
 
-// PREF
-static NS_DEFINE_CID(kCPrefCID, NS_PREF_CID);
-
 // PARSER
 static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
 static NS_DEFINE_CID(kCWellFormedDTDCID, NS_WELLFORMEDDTD_CID);
@@ -191,13 +164,6 @@ static NS_DEFINE_CID(kCNavDTDCID, NS_CNAVDTD_CID);
 static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
 static NS_DEFINE_IID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID);
 
-// NETLIB
-#ifndef NECKO
-static NS_DEFINE_CID(kCNetServiceCID, NS_NETSERVICE_CID);
-#else
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-#endif // NECKO
-
 // PLUGIN
 static NS_DEFINE_IID(kCPluginHostCID, NS_PLUGIN_HOST_CID);
 static NS_DEFINE_CID(kCPluginManagerCID,          NS_PLUGINMANAGER_CID);
@@ -380,9 +346,6 @@ NS_SetupRegistry()
   nsComponentManager::RegisterComponentLib(kCWebShellCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponentLib(kCDocLoaderServiceCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
 
-  // PREF
-  nsComponentManager::RegisterComponentLib(kCPrefCID, "Preferences Services", "component://netscape/preferences", PREF_DLL, PR_FALSE, PR_FALSE);
-
   // PARSER
   nsComponentManager::RegisterComponentLib(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponentLib(kCWellFormedDTDCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
@@ -392,13 +355,6 @@ NS_SetupRegistry()
   nsComponentManager::RegisterComponentLib(kCDOMScriptObjectFactory, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponentLib(kCScriptNameSetRegistry, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
 
-  // NETLIB
-#ifndef NECKO
-  nsComponentManager::RegisterComponentLib(kCNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE);
-#else
-//  nsComponentManager::RegisterComponentLib(kIOServiceCID, NULL, NULL, NECKO_DLL, PR_FALSE, PR_FALSE);
-#endif // NECKO
-
   // PLUGIN
   nsComponentManager::RegisterComponentLib(kCPluginHostCID, NULL, NULL, PLUGIN_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponentLib(kCPluginManagerCID, NULL, NULL, PLUGIN_DLL, PR_FALSE, PR_FALSE);