Bug 1617170 - Make GetFileForFileInfo a non-static member function. r=dom-workers-and-storage-reviewers,janv

Differential Revision: https://phabricator.services.mozilla.com/D64344

--HG--
extra : moz-landing-system : lando

dom/indexedDB/ActorsParent.cpp

@@ -19656,8 +19656,7 @@ DatabaseOperationBase::GetStructuredCloneReadInfoFromExternalBlob(
   const StructuredCloneFile& file = files[index];
   MOZ_ASSERT(file.Type() == StructuredCloneFile::eStructuredClone);
 
-  const nsCOMPtr<nsIFile> nativeFile =
-      FileInfo::GetFileForFileInfo(file.FileInfo());
+  const nsCOMPtr<nsIFile> nativeFile = file.FileInfo().GetFileForFileInfo();
   if (NS_WARN_IF(!nativeFile)) {
     return Err(NS_ERROR_FAILURE);
   }
@@ -23672,7 +23671,7 @@ CreateFileOp::CreateFileOp(Database* aDatabase,
 }
 
 nsresult CreateFileOp::CreateMutableFile(RefPtr<MutableFile>* aMutableFile) {
-  nsCOMPtr<nsIFile> file = FileInfo::GetFileForFileInfo(**mFileInfo);
+  nsCOMPtr<nsIFile> file = (*mFileInfo)->GetFileForFileInfo();
   if (NS_WARN_IF(!file)) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;

dom/indexedDB/FileInfo.cpp

@@ -126,15 +126,13 @@ void FileInfo::Cleanup() {
   }
 }
 
-/* static */
-nsCOMPtr<nsIFile> FileInfo::GetFileForFileInfo(const FileInfo& aFileInfo) {
-  FileManager* const fileManager = aFileInfo.Manager();
-  const nsCOMPtr<nsIFile> directory = fileManager->GetDirectory();
+nsCOMPtr<nsIFile> FileInfo::GetFileForFileInfo() const {
+  const nsCOMPtr<nsIFile> directory = Manager()->GetDirectory();
   if (NS_WARN_IF(!directory)) {
     return nullptr;
   }
 
-  nsCOMPtr<nsIFile> file = FileManager::GetFileForId(directory, aFileInfo.Id());
+  nsCOMPtr<nsIFile> file = FileManager::GetFileForId(directory, Id());
   if (NS_WARN_IF(!file)) {
     return nullptr;
   }

dom/indexedDB/FileInfo.h

@@ -57,7 +57,7 @@ class FileInfo final {
 
   int64_t Id() const { return mFileId; }
 
-  static nsCOMPtr<nsIFile> GetFileForFileInfo(const FileInfo& aFileInfo);
+  nsCOMPtr<nsIFile> GetFileForFileInfo() const;
 
  private:
   void UpdateReferences(

dom/indexedDB/IDBObjectStore.cpp

@@ -652,8 +652,7 @@ class ValueDeserializationHelper {
        * real-looking Blob/File instance because the index's key path can
        * reference their properties.  Rather than create a fake-looking object,
        * create a real Blob. */
-      const nsCOMPtr<nsIFile> file =
-          FileInfo::GetFileForFileInfo(aFile.FileInfo());
+      const nsCOMPtr<nsIFile> file = aFile.FileInfo().GetFileForFileInfo();
       if (!file) {
         return nullptr;
       }