summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authoradeshkp <adeshkp@users.noreply.github.com>2019-11-09 23:07:27 +0530
committeradeshkp <adeshkp@users.noreply.github.com>2019-11-10 06:03:32 -0500
commit484200b01b146e09ae24114fbd88bae64d099759 (patch)
tree293c37e758624787852fcdee330eca57968e1dba /dom
parenta6441a2a844a9e2c427dab3f94e39f2625bfd2d0 (diff)
downloadUXP-484200b01b146e09ae24114fbd88bae64d099759.tar
UXP-484200b01b146e09ae24114fbd88bae64d099759.tar.gz
UXP-484200b01b146e09ae24114fbd88bae64d099759.tar.lz
UXP-484200b01b146e09ae24114fbd88bae64d099759.tar.xz
UXP-484200b01b146e09ae24114fbd88bae64d099759.zip
Issue #1259 - Part 5. Remove migration path for Adobe GMP storage
As a cleanup task, also remove GMP storage migration for Fx 42 era.
Diffstat (limited to 'dom')
-rw-r--r--dom/media/gmp/GMPServiceParent.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/dom/media/gmp/GMPServiceParent.cpp b/dom/media/gmp/GMPServiceParent.cpp
index 2b4831cd6..fcf9fa920 100644
--- a/dom/media/gmp/GMPServiceParent.cpp
+++ b/dom/media/gmp/GMPServiceParent.cpp
@@ -203,29 +203,6 @@ MoveAndOverwrite(nsIFile* aOldParentDir,
}
}
-static void
-MigratePreGecko42StorageDir(nsIFile* aOldStorageDir,
- nsIFile* aNewStorageDir)
-{
- MoveAndOverwrite(aOldStorageDir, aNewStorageDir, NS_LITERAL_STRING("id"));
- MoveAndOverwrite(aOldStorageDir, aNewStorageDir, NS_LITERAL_STRING("storage"));
-}
-
-static void
-MigratePreGecko45StorageDir(nsIFile* aStorageDirBase)
-{
- nsCOMPtr<nsIFile> adobeStorageDir(CloneAndAppend(aStorageDirBase, NS_LITERAL_STRING("gmp-eme-adobe")));
- if (NS_WARN_IF(!adobeStorageDir)) {
- return;
- }
-
- // The base storage dir in pre-45 contained "id" and "storage" subdirs.
- // We assume all storage in the base storage dir that aren't known to GMP
- // storage are records for the Adobe GMP.
- MoveAndOverwrite(aStorageDirBase, adobeStorageDir, NS_LITERAL_STRING("id"));
- MoveAndOverwrite(aStorageDirBase, adobeStorageDir, NS_LITERAL_STRING("storage"));
-}
-
static nsresult
GMPPlatformString(nsAString& aOutPlatform)
{
@@ -308,19 +285,6 @@ GeckoMediaPluginServiceParent::InitStorage()
return rv;
}
- // Prior to 42, GMP storage was stored in $profileDir/gmp/. After 42, it's
- // stored in $profileDir/gmp/$platform/. So we must migrate any old records
- // from the old location to the new location, for forwards compatibility.
- MigratePreGecko42StorageDir(gmpDirWithoutPlatform, mStorageBaseDir);
-
- // Prior to 45, GMP storage was not separated by plugin. In 45 and after,
- // it's stored in $profile/gmp/$platform/$gmpName. So we must migrate old
- // records from the old location to the new location, for forwards
- // compatibility. We assume all directories in the base storage dir that
- // aren't known to GMP storage are records for the Adobe GMP, since it
- // was first.
- MigratePreGecko45StorageDir(mStorageBaseDir);
-
return GeckoMediaPluginService::Init();
}