2 files changed, 20 insertions, 0 deletions
diff --git a/netwerk/cache2/CacheFileContextEvictor.cpp b/netwerk/cache2/CacheFileContextEvictor.cpp
index 65feb44620..fd4e97550d 100644
--- a/netwerk/cache2/CacheFileContextEvictor.cpp
+++ b/netwerk/cache2/CacheFileContextEvictor.cpp
@@ -269,7 +269,11 @@ CacheFileContextEvictor::PersistEvictionInfoToDisk(
   }
 
   nsAutoCString path;
+#ifdef XP_WIN
+  file->GetPersistentDescriptor(path);
+#else
   file->GetNativePath(path);
+#endif
 
   PRFileDesc *fd;
   rv = file->OpenNSPRFileDesc(PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE, 0600,
@@ -306,7 +310,11 @@ CacheFileContextEvictor::RemoveEvictInfoFromDisk(
   }
 
   nsAutoCString path;
+#ifdef XP_WIN
+  file->GetPersistentDescriptor(path);
+#else
   file->GetNativePath(path);
+#endif
 
   rv = file->Remove(false);
   if (NS_WARN_IF(NS_FAILED(rv))) {
diff --git a/netwerk/cache2/CacheFileIOManager.cpp b/netwerk/cache2/CacheFileIOManager.cpp
index 845ad73147..71dcb47155 100644
--- a/netwerk/cache2/CacheFileIOManager.cpp
+++ b/netwerk/cache2/CacheFileIOManager.cpp
@@ -3096,7 +3096,11 @@ nsresult
 CacheFileIOManager::TrashDirectory(nsIFile *aFile)
 {
   nsAutoCString path;
+#ifdef XP_WIN
+  aFile->GetPersistentDescriptor(path);
+#else
   aFile->GetNativePath(path);
+#endif
   LOG(("CacheFileIOManager::TrashDirectory() [file=%s]", path.get()));
 
   nsresult rv;
@@ -3340,7 +3344,11 @@ CacheFileIOManager::RemoveTrashInternal()
                    "recursively, but this can block IO thread for a while!");
         if (LOG_ENABLED()) {
           nsAutoCString path;
+#ifdef XP_WIN
+          file->GetPersistentDescriptor(path);
+#else
           file->GetNativePath(path);
+#endif
           LOG(("CacheFileIOManager::RemoveTrashInternal() - Found a directory in a trash "
               "directory! It will be removed recursively, but this can block IO "
               "thread for a while! [file=%s]", path.get()));
@@ -3873,7 +3881,11 @@ CacheFileIOManager::SyncRemoveDir(nsIFile *aFile, const char *aDir)
 
   if (LOG_ENABLED()) {
     nsAutoCString path;
+#ifdef XP_WIN
+    file->GetPersistentDescriptor(path);
+#else
     file->GetNativePath(path);
+#endif
     LOG(("CacheFileIOManager::SyncRemoveDir() - Removing directory %s",
          path.get()));
   }