diff options
| author | adeshkp <adeshkp@users.noreply.github.com> | 2020-05-04 23:41:48 -0400 |
|---|---|---|
| committer | adeshkp <adeshkp@users.noreply.github.com> | 2020-05-04 23:41:48 -0400 |
| commit | e30de2764c540add91a60f6fb5fadac1d4c65af7 (patch) | |
| tree | 72cb3b12bbaffda58a05ce57abbea42f2a35bff9 | |
| parent | bceb13e66db7095ffeab737f8007b1ebd23b24f6 (diff) | |
| download | uxp-e30de2764c540add91a60f6fb5fadac1d4c65af7.tar.gz | |
Issue mcp-graveyard/UXP#1259 - Remove a leftover GMP migration function
| -rw-r--r-- | dom/media/gmp/GMPServiceParent.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/dom/media/gmp/GMPServiceParent.cpp b/dom/media/gmp/GMPServiceParent.cpp index fcf9fa9202..a4afbdad44 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) { |