enabling link prefetching on all platforms except XP_MAC for now (b=12274)

r=dougt sr=rpotts

uriloader/Makefile.in

@@ -29,6 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 DIRS		= \
 		base \
 		exthandler \
+		prefetch \
 		build \
 		$(NULL)
 

uriloader/build/Makefile.in

@@ -37,10 +37,12 @@ REQUIRES	= xpcom \
 		  necko \
 		  mimetype \
 		  exthandler \
+		  prefetch \
 		  rdf \
 		  helperAppDlg \
 		  dom \
 		  uconv \
+		  htmlparser \
 		  $(NULL)
 
 CPPSRCS		= nsURILoaderModule.cpp
@@ -48,6 +50,11 @@ CPPSRCS		= nsURILoaderModule.cpp
 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
+		$(NULL)
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../prefetch \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \

uriloader/build/nsURILoaderModule.cpp

@@ -41,6 +41,11 @@
 #include "nsOSHelperAppService.h"
 #include "nsExternalProtocolHandler.h"
 
+#if !defined(XP_MAC)
+#include "nsPrefetchService.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefetchService, Init)
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 // Define the contructor function for the objects
 //
@@ -68,7 +73,11 @@ static const nsModuleComponentInfo components[] = {
   { "Netscape Mime Mapping Service", NS_EXTERNALHELPERAPPSERVICE_CID, NS_MIMESERVICE_CONTRACTID, 
      nsOSHelperAppServiceConstructor, },
   { "Netscape Default Protocol Handler", NS_EXTERNALPROTOCOLHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"default", 
-     nsExternalProtocolHandlerConstructor, } 
+     nsExternalProtocolHandlerConstructor, },
+#if !defined(XP_MAC)
+  {  NS_PREFETCHSERVICE_CLASSNAME, NS_PREFETCHSERVICE_CID, NS_PREFETCHSERVICE_CONTRACTID,
+     nsPrefetchServiceConstructor, nsPrefetchService::RegisterProc, nsPrefetchService::UnregisterProc },
+#endif
 };