Templates in nsXPComFactory exorcism. Part I.

Replaced the template code with a NS_DEF_FACTORY.
This is temporary.  As soon as I can verify this works on windows and
mac, ill remove the old code.

xpfe/appshell/src/nsAppShellService.cpp

@@ -351,11 +351,16 @@ NS_EXPORT nsresult NS_NewAppShellService(nsIAppShellService** aResult)
 //----------------------------------------------------------------------
 
 // Entry point to create nsAppShellService factory instances...
+NS_DEF_FACTORY(AppShellService,nsAppShellService)
 
 nsresult NS_NewAppShellServiceFactory(nsIFactory** aResult)
 {
   nsresult rv = NS_OK;
+#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM)
+  nsIFactory* inst = new nsAppShellServiceFactory;
+#else
   nsIFactory* inst = new nsFactory<nsAppShellService>();
+#endif
   if (nsnull == inst) {
     rv = NS_ERROR_OUT_OF_MEMORY;
   }