5 files changed, 20 insertions, 5 deletions
diff --git a/dom/media/gmp/GMPServiceParent.cpp b/dom/media/gmp/GMPServiceParent.cpp
index a4afbdad44..d1ad26a4a0 100644
--- a/dom/media/gmp/GMPServiceParent.cpp
+++ b/dom/media/gmp/GMPServiceParent.cpp
@@ -1018,12 +1018,11 @@ GeckoMediaPluginServiceParent::PluginTerminated(const RefPtr<GMPParent>& aPlugin
   MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread);
 
   if (aPlugin->IsMarkedForDeletion()) {
-    nsCString path8;
+    nsString path;
     RefPtr<nsIFile> dir = aPlugin->GetDirectory();
-    nsresult rv = dir->GetNativePath(path8);
+    nsresult rv = dir->GetPath(path);
     NS_ENSURE_SUCCESS_VOID(rv);
 
-    nsString path = NS_ConvertUTF8toUTF16(path8);
     if (mPluginsWaitingForDeletion.Contains(path)) {
       RemoveOnGMPThread(path, true /* delete */, true /* can defer */);
     }
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index c9c1b71fe0..cb9990bdd5 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -2037,10 +2037,14 @@ 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
+#endif // PLUGIN_LOGGING 
 
   nsCOMPtr<nsISimpleEnumerator> iter;
   rv = pluginsDir->GetDirectoryEntries(getter_AddRefs(iter));
@@ -3615,7 +3619,11 @@ 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 603f2408c8..7ee5cd7fbb 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -1265,7 +1265,11 @@ 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 8c2d26ca2c..5a2d85f293 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->GetNativePath(path)))
+  if (NS_FAILED(file->GetPersistentDescriptor(path)))
     return false;
 
   const char *cPath = path.get();
diff --git a/dom/xul/nsXULPrototypeCache.cpp b/dom/xul/nsXULPrototypeCache.cpp
index 5644405f5c..8f08ae5444 100644
--- a/dom/xul/nsXULPrototypeCache.cpp
+++ b/dom/xul/nsXULPrototypeCache.cpp
@@ -466,7 +466,11 @@ 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;