summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradeshkp <adeshkp@users.noreply.github.com>2020-05-04 23:41:48 -0400
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-05-06 19:14:42 +0200
commit0aa1b02b2b724749323c1548179208ded67a1410 (patch)
treeec1f0a7ea7ac08b9b1f97f88cbaae5c784e7a513
parente008deb88bc6768fd6e85dc0d8d77973a8f83f50 (diff)
downloadUXP-0aa1b02b2b724749323c1548179208ded67a1410.tar
UXP-0aa1b02b2b724749323c1548179208ded67a1410.tar.gz
UXP-0aa1b02b2b724749323c1548179208ded67a1410.tar.lz
UXP-0aa1b02b2b724749323c1548179208ded67a1410.tar.xz
UXP-0aa1b02b2b724749323c1548179208ded67a1410.zip
Issue #1259 - Remove a leftover GMP migration function
-rw-r--r--dom/media/gmp/GMPServiceParent.cpp41
1 files changed, 0 insertions, 41 deletions
diff --git a/dom/media/gmp/GMPServiceParent.cpp b/dom/media/gmp/GMPServiceParent.cpp
index fcf9fa920..a4afbdad4 100644
--- a/dom/media/gmp/GMPServiceParent.cpp
+++ b/dom/media/gmp/GMPServiceParent.cpp
@@ -162,47 +162,6 @@ CloneAndAppend(nsIFile* aFile, const nsAString& aDir)
return f.forget();
}
-static void
-MoveAndOverwrite(nsIFile* aOldParentDir,
- nsIFile* aNewParentDir,
- const nsAString& aSubDir)
-{
- nsresult rv;
-
- nsCOMPtr<nsIFile> srcDir(CloneAndAppend(aOldParentDir, aSubDir));
- if (NS_WARN_IF(!srcDir)) {
- return;
- }
-
- if (!FileExists(srcDir)) {
- // No sub-directory to be migrated.
- return;
- }
-
- // Ensure destination parent directory exists.
- rv = aNewParentDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
- if (rv != NS_ERROR_FILE_ALREADY_EXISTS && NS_WARN_IF(NS_FAILED(rv))) {
- return;
- }
-
- nsCOMPtr<nsIFile> dstDir(CloneAndAppend(aNewParentDir, aSubDir));
- if (FileExists(dstDir)) {
- // We must have migrated before already, and then ran an old version
- // of Gecko again which created storage at the old location. Overwrite
- // the previously migrated storage.
- rv = dstDir->Remove(true);
- if (NS_WARN_IF(NS_FAILED(rv))) {
- // MoveTo will fail.
- return;
- }
- }
-
- rv = srcDir->MoveTo(aNewParentDir, EmptyString());
- if (NS_WARN_IF(NS_FAILED(rv))) {
- return;
- }
-}
-
static nsresult
GMPPlatformString(nsAString& aOutPlatform)
{