backing out

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

mozilla/embedding/base/nsEmbedAPI.cpp

@@ -28,9 +28,6 @@
 
 #include "nsIStringBundle.h"
 
-#include "nsIDirectoryService.h"
-#include "nsAppFileLocationProvider.h"
-
 #include "nsEmbedAPI.h"
 
 static nsIServiceManager *sServiceManager = nsnull;
@@ -69,11 +66,24 @@ static XPCOMCleanupHack sXPCOMCleanupHack;
 extern "C" void NS_SetupRegistry();
 
 
-nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
-                          nsIDirectoryServiceProvider *appFileLocProvider)
+nsresult NS_InitEmbedding(const char *aPath)
 {
-    nsresult rv;
+    // Create an object to represent the path
+    nsILocalFile *localFile = nsnull;
+    if (aPath && strlen(aPath) > 0)
+    {
+        NS_NewLocalFile(aPath, PR_FALSE, &localFile);
+    }
 
+    nsresult rv = NS_InitEmbedding(localFile);
+    NS_IF_RELEASE(localFile);
+
+    return rv;
+}
+
+
+nsresult NS_InitEmbedding(nsILocalFile *aPath)
+{
     // Reentrant calls to this method do nothing except increment a counter
     sInitCounter++;
     if (sInitCounter > 1)
@@ -86,32 +96,19 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
 #endif
     {
         // Initialise XPCOM
-        NS_InitXPCOM(&sServiceManager, mozBinDirectory);
+        NS_InitXPCOM(&sServiceManager, aPath);
+        
         if (!sServiceManager)
             return NS_ERROR_NULL_POINTER;
-        
-        // Hook up the file location provider - make one if nsnull was passed
-        if (!appFileLocProvider)
-        {
-            appFileLocProvider = new nsAppFileLocationProvider;
-            if (!appFileLocProvider)
-                return NS_ERROR_OUT_OF_MEMORY;
-            NS_ADDREF(appFileLocProvider);
-        }
-        NS_WITH_SERVICE(nsIDirectoryService, directoryService, NS_DIRECTORY_SERVICE_PROGID, &rv);
-        if (NS_FAILED(rv))
-            return rv;
-        rv = directoryService->RegisterProvider(appFileLocProvider);
-        if (rv != 1) // This is needed but WRONG. RegisterProvider returns TRUE is suceeded, should return NS_OK
-            return NS_ERROR_FAILURE;
-        NS_RELEASE(appFileLocProvider); // RegisterProvider did AddRef - It owns it now 
-        
+
 #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
         sXPCOMInitializedFlag = PR_TRUE;
         sXPCOMCleanupHack.mCleanOnExit = PR_TRUE;
 #endif
     }
 
+    nsresult rv;
+
     // Register components
     if (!sRegistryInitializedFlag)
     {