4 files changed, 6 insertions, 19 deletions
diff --git a/components/jar/src/nsJAR.cpp b/components/jar/src/nsJAR.cpp
index 205649e8d..f79a99948 100644
--- a/components/jar/src/nsJAR.cpp
+++ b/components/jar/src/nsJAR.cpp
@@ -418,7 +418,7 @@ nsJAR::GetJarPath(nsACString& aResult)
 {
   NS_ENSURE_ARG_POINTER(mZipFile);
 
-  return mZipFile->GetPersistentDescriptor(aResult);
+  return mZipFile->GetNativePath(aResult);
 }
 
 nsresult
@@ -1120,7 +1120,7 @@ nsZipReaderCache::IsCached(nsIFile* zipFile, bool* aResult)
   MutexAutoLock lock(mLock);
 
   nsAutoCString uri;
-  rv = zipFile->GetPersistentDescriptor(uri);
+  rv = zipFile->GetNativePath(uri);
   if (NS_FAILED(rv))
     return rv;
 
@@ -1142,7 +1142,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result)
 #endif
 
   nsAutoCString uri;
-  rv = zipFile->GetPersistentDescriptor(uri);
+  rv = zipFile->GetNativePath(uri);
   if (NS_FAILED(rv)) return rv;
 
   uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
@@ -1186,7 +1186,7 @@ nsZipReaderCache::GetInnerZip(nsIFile* zipFile, const nsACString &entry,
 #endif
 
   nsAutoCString uri;
-  rv = zipFile->GetPersistentDescriptor(uri);
+  rv = zipFile->GetNativePath(uri);
   if (NS_FAILED(rv)) return rv;
 
   uri.Insert(NS_LITERAL_CSTRING("jar:"), 0);
@@ -1229,7 +1229,7 @@ nsZipReaderCache::GetFd(nsIFile* zipFile, PRFileDesc** aRetVal)
 
   nsresult rv;
   nsAutoCString uri;
-  rv = zipFile->GetPersistentDescriptor(uri);
+  rv = zipFile->GetNativePath(uri);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -1370,7 +1370,7 @@ nsZipReaderCache::Observe(nsISupports *aSubject,
       return NS_OK;
 
     nsAutoCString uri;
-    if (NS_FAILED(file->GetPersistentDescriptor(uri)))
+    if (NS_FAILED(file->GetNativePath(uri)))
       return NS_OK;
 
     uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
diff --git a/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
index cd10401bb..02be71e4d 100644
--- a/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
+++ b/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
@@ -76,11 +76,7 @@ FFVPXRuntimeLinker::Init()
     return false;
   }
   nsAutoCString rootPath;
-#ifdef XP_WIN
-  if (NS_FAILED(rootDir->GetPersistentDescriptor(rootPath))) {
-#else
   if (NS_FAILED(rootDir->GetNativePath(rootPath))) {
-#endif
     return false;
   }
 
diff --git a/system/graphics/layers/composite/FPSCounter.cpp b/system/graphics/layers/composite/FPSCounter.cpp
index 0cbc76066..b8e93eb97 100644
--- a/system/graphics/layers/composite/FPSCounter.cpp
+++ b/system/graphics/layers/composite/FPSCounter.cpp
@@ -364,11 +364,7 @@ FPSCounter::WriteFrameTimeStamps()
   PR_Close(fd);
 
   nsAutoCString path;
-#ifdef XP_WIN
-  rv = resultFile->GetPersistentDescriptor(path);
-#else
   rv = resultFile->GetNativePath(path);
-#endif
   NS_ENSURE_SUCCESS(rv, rv);
 
   printf_stderr("Wrote FPS data to file: %s\n", path.get());
diff --git a/system/runtime/nsAppRunner.cpp b/system/runtime/nsAppRunner.cpp
index c6569dc96..459de8e7d 100644
--- a/system/runtime/nsAppRunner.cpp
+++ b/system/runtime/nsAppRunner.cpp
@@ -1982,13 +1982,8 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n
     profile->GetRootDir(getter_AddRefs(prefsJSFile));
     prefsJSFile->AppendNative(NS_LITERAL_CSTRING("prefs.js"));
     nsAutoCString pathStr;
-#ifdef XP_WIN
-    prefsJSFile->GetPersistentDescriptor(pathStr);
-#else
     prefsJSFile->GetNativePath(pathStr);
-#endif
     PR_fprintf(PR_STDERR, "Success: created profile '%s' at '%s'\n", arg, pathStr.get());
-
     bool exists;
     prefsJSFile->Exists(&exists);
     if (!exists) {