Fix for bug 68086. Replaced several about: files which were only redirecting to a new location with a single smarter one. r=rpotts, sr=darin

git-svn-id: svn://10.0.0.236/trunk@92641 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/netwerk/build/nsNetModule.cpp

@@ -168,9 +168,7 @@ UnregisterBasicAuth(nsIComponentManager *aCompMgr, nsIFile *aPath,
 #include "nsAboutBlank.h"
 #include "nsAboutBloat.h"
 #include "nsAboutCache.h"
-#include "nsAboutCredits.h"
-#include "nsAboutPlugins.h"
-#include "mzAboutMozilla.h"
+#include "nsAboutRedirector.h"
 #include "nsKeywordProtocolHandler.h"
 
 #ifdef MOZ_NEW_CACHE
@@ -841,19 +839,19 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
       nsAboutBloat::Create
     },
     { "about:credits",
-      NS_ABOUT_CREDITS_MODULE_CID,
+      NS_ABOUT_REDIRECTOR_MODULE_CID,
       NS_ABOUT_MODULE_CONTRACTID_PREFIX "credits",
-      nsAboutCredits::Create
+      nsAboutRedirector::Create
     },
     { "about:plugins",
-      NS_ABOUT_PLUGINS_MODULE_CID,
+      NS_ABOUT_REDIRECTOR_MODULE_CID,
       NS_ABOUT_MODULE_CONTRACTID_PREFIX "plugins",
-      nsAboutPlugins::Create
+      nsAboutRedirector::Create
     },
     { "about:mozilla",
-      MZ_ABOUT_MOZILLA_MODULE_CID,
+      NS_ABOUT_REDIRECTOR_MODULE_CID,
       NS_ABOUT_MODULE_CONTRACTID_PREFIX "mozilla",
-      mzAboutMozilla::Create
+      nsAboutRedirector::Create
     },
     { "about:cache", 
       NS_ABOUT_CACHE_MODULE_CID,

mozilla/netwerk/protocol/about/src/Makefile.in

@@ -35,9 +35,7 @@ CPPSRCS		= \
 		nsAboutBlank.cpp \
 		nsAboutBloat.cpp \
 		nsAboutCache.cpp \
-		nsAboutCredits.cpp \
-		nsAboutPlugins.cpp \
-		mzAboutMozilla.cpp \
+        nsAboutRedirector.cpp \
 		$(NULL)
 
 ifdef MOZ_NEW_CACHE

mozilla/netwerk/protocol/about/src/makefile.win

@@ -32,9 +32,7 @@ CPP_OBJS=                                      \
 	.\$(OBJDIR)\nsAboutProtocolHandler.obj \
 	.\$(OBJDIR)\nsAboutBlank.obj           \
 	.\$(OBJDIR)\nsAboutBloat.obj           \
-	.\$(OBJDIR)\nsAboutCredits.obj		 	\
-	.\$(OBJDIR)\mzAboutMozilla.obj		\
-	.\$(OBJDIR)\nsAboutPlugins.obj \
+	.\$(OBJDIR)\nsAboutRedirector.obj		 	\
 	.\$(OBJDIR)\nsAboutCache.obj		\
 !ifdef MOZ_NEW_CACHE
     .\$(OBJDIR)\nsAboutCacheEntry.obj \