Revert "Issue %3057 - Part 9: Adjust all callsites for no longer using GetNativePath"

This reverts commit 097fa969802f76530384926e8ef1f56777be3783.

4 files changed, 2 insertions, 18 deletions

diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index a7363de43..b36bf9633 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -2022,14 +2022,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
 
 #ifdef PLUGIN_LOGGING
   nsAutoCString dirPath;
-#ifdef XP_WIN
-  pluginsDir->GetPersistentDescriptor(dirPath);
-#else
   pluginsDir->GetNativePath(dirPath);
-#endif
   PLUGIN_LOG(PLUGIN_LOG_BASIC,
   ("nsPluginHost::ScanPluginsDirectory dir=%s\n", dirPath.get()));
-#endif // PLUGIN_LOGGING
+#endif
 
   nsCOMPtr<nsISimpleEnumerator> iter;
   rv = pluginsDir->GetDirectoryEntries(getter_AddRefs(iter));
@@ -3604,11 +3600,7 @@ nsPluginHost::CreateTempFileToPost(const char *aPostDataURL, nsIFile **aTmpFile)
   }
   rv = inFile->GetFileSize(&fileSize);
   if (NS_FAILED(rv)) return rv;
-#ifdef XP_WIN
-  rv = inFile->GetPersistentDescriptor(filename);
-#else
   rv = inFile->GetNativePath(filename);
-#endif
   if (NS_FAILED(rv)) return rv;
 
   if (fileSize != 0) {
diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
index 7ee5cd7fb..603f2408c 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -1265,11 +1265,7 @@ nsPluginStreamListenerPeer::OnFileAvailable(nsIFile* aFile)
     return NS_ERROR_FAILURE;
 
   nsAutoCString path;
-#ifdef XP_WIN
-  rv = aFile->GetPersistentDescriptor(path);
-#else
   rv = aFile->GetNativePath(path);
-#endif
   if (NS_FAILED(rv)) return rv;
 
   if (path.IsEmpty()) {
diff --git a/dom/plugins/base/nsPluginsDirWin.cpp b/dom/plugins/base/nsPluginsDirWin.cpp
index 5a2d85f29..8c2d26ca2 100644
--- a/dom/plugins/base/nsPluginsDirWin.cpp
+++ b/dom/plugins/base/nsPluginsDirWin.cpp
@@ -239,7 +239,7 @@ static bool CanLoadPlugin(char16ptr_t aBinaryPath)
 bool nsPluginsDir::IsPluginFile(nsIFile* file)
 {
   nsAutoCString path;
-  if (NS_FAILED(file->GetPersistentDescriptor(path)))
+  if (NS_FAILED(file->GetNativePath(path)))
     return false;
 
   const char *cPath = path.get();
diff --git a/dom/xul/nsXULPrototypeCache.cpp b/dom/xul/nsXULPrototypeCache.cpp
index 8f08ae544..5644405f5 100644
--- a/dom/xul/nsXULPrototypeCache.cpp
+++ b/dom/xul/nsXULPrototypeCache.cpp
@@ -466,11 +466,7 @@ nsXULPrototypeCache::BeginCaching(nsIURI* aURI)
     if (NS_FAILED(rv))
         return rv;
     nsAutoCString chromePath;
-#ifdef XP_WIN
-    rv = chromeDir->GetPersistentDescriptor(chromePath);
-#else
     rv = chromeDir->GetNativePath(chromePath);
-#endif
     if (NS_FAILED(rv))
         return rv;