all three platforms have an implementation of nsIUserInfo now.

(but mac and windows impls need work, see bugs #29594 and #29596)

xpfe/appshell/src/nsAppShellFactory.cpp

@@ -47,14 +47,7 @@
 #include "nsDialogParamBlock.h"
 #include "nsFileLocations.h"
 
-/* right now, only unix and windows have implementations of nsIUserInfo.  mac is coming soon. */
-#if defined(XP_UNIX) || defined(XP_PC)
-#define HAVE_USER_INFO 1
-#endif /* XP_UNIX */
-
-#ifdef HAVE_USER_INFO
 #include "nsUserInfo.h"
-#endif /* HAVE_USER_INFO */
 
 /* extern the factory entry points for each component... */
 nsresult NS_NewAppShellServiceFactory(nsIFactory** aFactory);
@@ -69,10 +62,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSessionHistory);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommonDialogs);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFileLocator);
-#ifdef HAVE_USER_INFO
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo);
-#endif /* HAVE_USER_INFO */ 
-
 
 static nsModuleComponentInfo gAppShellModuleInfo[] =
 {
@@ -126,13 +116,11 @@ static nsModuleComponentInfo gAppShellModuleInfo[] =
     NS_FILELOCATOR_PROGID,
     nsFileLocatorConstructor,
   },
-#ifdef HAVE_USER_INFO
   { "User Info Service",
     NS_USERINFO_CID,
     NS_USERINFO_PROGID,
     nsUserInfoConstructor,
   },
-#endif /* HAVE_USER_INFO */ 
 };
 
 NS_IMPL_NSGETMODULE("appshell", gAppShellModuleInfo)