Remove the many forms of NS_SetupRegistry since the classes registered are all now part of proper components. r=dougt, jag sr=rpotts b=81527

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

mozilla/embedding/base/Makefile.in

@@ -49,7 +49,6 @@ XPIDLSRCS	= nsIWindowCreator.idl \
                   $(NULL)
 
 CPPSRCS         = \
-                nsSetupRegistry.cpp \
                 nsEmbedAPI.cpp \
                 $(NULL)
 

mozilla/embedding/base/macbuild/EmbedAPI.xml

@@ -924,13 +924,6 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsSetupRegistry.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>
@@ -938,11 +931,6 @@
                     <PATH>nsEmbedAPI.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsSetupRegistry.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
             </LINKORDER>
         </TARGET>
         <TARGET>
@@ -1816,13 +1804,6 @@
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsSetupRegistry.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
             </FILELIST>
             <LINKORDER>
                 <FILEREF>
@@ -1830,11 +1811,6 @@
                     <PATH>nsEmbedAPI.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsSetupRegistry.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
             </LINKORDER>
         </TARGET>
     </TARGETLIST>
@@ -1852,12 +1828,6 @@
                 <PATH>nsEmbedAPI.cpp</PATH>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
-            <FILEREF>
-                <TARGETNAME>EmbedAPIDebug.o</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>nsSetupRegistry.cpp</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
         </GROUP>
     </GROUPLIST>
 

mozilla/embedding/base/makefile.win

@@ -48,7 +48,6 @@ XPIDLSRCS = \
 CPP_OBJS=											\
     .\$(OBJDIR)\nsEmbedAPI.obj \
     .\$(OBJDIR)\nsEmbedWin32.obj \
-    .\$(OBJDIR)\nsSetupRegistry.obj \
 		$(NULL)
 
 include <$(DEPTH)\config\rules.mak>

mozilla/embedding/base/nsEmbedAPI.cpp

@@ -65,8 +65,6 @@ static PRBool sXPCOMInitializedFlag = PR_FALSE;
 static XPCOMCleanupHack sXPCOMCleanupHack;
 #endif
 
-extern "C" void NS_SetupRegistry();
-
 
 nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
                           nsIDirectoryServiceProvider *appFileLocProvider)
@@ -108,9 +106,6 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
     // Register components
     if (!sRegistryInitializedFlag)
     {
-        // XXX hack method
-        NS_SetupRegistry();
-        
         rv = nsComponentManager::AutoRegister(nsIComponentManagerObsolete::NS_Startup,
                                               NULL /* default */);
         if (NS_FAILED(rv))

mozilla/embedding/base/nsSetupRegistry.cpp

@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This evil file will go away when the XPCOM registry can be 
- * externally initialized!
- *
- * Until then, include the real file to keep everything in sync.
- */
-#include "../../xpfe/bootstrap/nsSetupRegistry.cpp"