Migrate OpenFileCallback parameter to OnceCallback

This CL replaces a legacy Closure in OpenFileCallback with OnceClosure
as a preparation of the full migration of fileapi to OnceCallback.
As it's in a function signature, it had blocked the incremental
migration.

Change-Id: I53471c0a178687fcb9ab97365e0421a124fc3575
Reviewed-on: https://chromium-review.googlesource.com/933883Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539086}

chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc

@@ -53,8 +53,7 @@ class EventLogger {
     result_.reset(new base::File::Error(error));
   }
 
-  void OnCreateOrOpen(base::File file,
-                      const base::Closure& on_close_callback) {
+  void OnCreateOrOpen(base::File file, base::OnceClosure on_close_callback) {
     if (file.IsValid())
       result_.reset(new base::File::Error(base::File::FILE_OK));
 

chrome/browser/extensions/app_data_migrator_unittest.cc

@@ -180,8 +180,7 @@ void GenerateTestFiles(content::MockBlobURLRequestContext* url_request_context,
   content::RunAllTasksUntilIdle();
 }
 
-void VerifyFileContents(base::File file,
-                        const base::Closure& on_close_callback) {
+void VerifyFileContents(base::File file, base::OnceClosure on_close_callback) {
   ASSERT_EQ(14, file.GetLength());
   std::unique_ptr<char[]> buffer(new char[15]);
 
@@ -194,7 +193,7 @@ void VerifyFileContents(base::File file,
 
   file.Close();
   if (!on_close_callback.is_null())
-    on_close_callback.Run();
+    std::move(on_close_callback).Run();
   base::RunLoop::QuitCurrentWhenIdleDeprecated();
 }
 

content/browser/fileapi/file_system_operation_runner_unittest.cc

@@ -53,7 +53,7 @@ void GetCancelStatus(bool* operation_done,
   *status_out = status;
 }
 
-void DidOpenFile(base::File file, const base::Closure& on_close_callback) {}
+void DidOpenFile(base::File file, base::OnceClosure on_close_callback) {}
 
 }  // namespace
 

content/browser/media/cdm_file_impl.cc

@@ -200,9 +200,8 @@ void CdmFileImpl::OpenFile(const std::string& file_name,
                           std::move(callback));
 }
 
-void CdmFileImpl::OnFileOpenedForReading(
-    base::File file,
-    const base::Closure& on_close_callback) {
+void CdmFileImpl::OnFileOpenedForReading(base::File file,
+                                         base::OnceClosure on_close_callback) {
   DVLOG(3) << __func__ << " file: " << file_name_;
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK_EQ(LockState::kFileLocked, lock_state_);
@@ -255,7 +254,7 @@ void CdmFileImpl::OpenFileForWriting(OpenFileForWritingCallback callback) {
 
 void CdmFileImpl::OnTempFileOpenedForWriting(
     base::File file,
-    const base::Closure& on_close_callback) {
+    base::OnceClosure on_close_callback) {
   DVLOG(3) << __func__ << " file: " << file_name_;
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK_EQ(LockState::kFileAndTempFileLocked, lock_state_);

content/browser/media/cdm_file_impl.h

@@ -72,9 +72,9 @@ class CdmFileImpl final : public media::mojom::CdmFile {
                 CreateOrOpenCallback callback);
 
   void OnFileOpenedForReading(base::File file,
-                              const base::Closure& on_close_callback);
+                              base::OnceClosure on_close_callback);
   void OnTempFileOpenedForWriting(base::File file,
-                                  const base::Closure& on_close_callback);
+                                  base::OnceClosure on_close_callback);
   void OnFileRenamed(base::File::Error move_result);
 
   // Returns the FileSystemURL for the specified |file_name|.
@@ -109,8 +109,8 @@ class CdmFileImpl final : public media::mojom::CdmFile {
   // storage::AsyncFileUtil::CreateOrOpen() returns this callback on a
   // successful open along with the base::File object, which should be
   // called when the file is closed.
-  base::Closure on_close_callback_;
-  base::Closure temporary_file_on_close_callback_;
+  base::OnceClosure on_close_callback_;
+  base::OnceClosure temporary_file_on_close_callback_;
 
   THREAD_CHECKER(thread_checker_);
   base::WeakPtrFactory<CdmFileImpl> weak_factory_;

content/browser/renderer_host/pepper/pepper_file_io_host.cc

@@ -84,22 +84,22 @@ bool FileOpenForWrite(int32_t open_flags) {
 void FileCloser(base::File auto_close) {
 }
 
-void DidCloseFile(const base::Closure& on_close_callback) {
+void DidCloseFile(base::OnceClosure on_close_callback) {
   if (!on_close_callback.is_null())
-    on_close_callback.Run();
+    std::move(on_close_callback).Run();
 }
 
 void DidOpenFile(base::WeakPtr<PepperFileIOHost> file_host,
                  scoped_refptr<base::SequencedTaskRunner> task_runner,
                  storage::FileSystemOperation::OpenFileCallback callback,
                  base::File file,
-                 const base::Closure& on_close_callback) {
+                 base::OnceClosure on_close_callback) {
   if (file_host) {
-    callback.Run(std::move(file), on_close_callback);
+    callback.Run(std::move(file), std::move(on_close_callback));
   } else {
     task_runner->PostTaskAndReply(
         FROM_HERE, base::BindOnce(&FileCloser, std::move(file)),
-        base::BindOnce(&DidCloseFile, on_close_callback));
+        base::BindOnce(&DidCloseFile, std::move(on_close_callback)));
   }
 }
 
@@ -264,9 +264,9 @@ void PepperFileIOHost::GotUIThreadStuffForInternalFileSystems(
 void PepperFileIOHost::DidOpenInternalFile(
     ppapi::host::ReplyMessageContext reply_context,
     base::File file,
-    const base::Closure& on_close_callback) {
+    base::OnceClosure on_close_callback) {
   if (file.IsValid()) {
-    on_close_callback_ = on_close_callback;
+    on_close_callback_ = std::move(on_close_callback);
 
     if (FileOpenForWrite(open_flags_) && file_system_host_->ChecksQuota()) {
       check_quota_ = true;
@@ -395,8 +395,7 @@ void PepperFileIOHost::DidOpenQuotaFile(
 void PepperFileIOHost::DidCloseFile(base::File::Error /*error*/) {
   // Silently ignore if we fail to close the file.
   if (!on_close_callback_.is_null()) {
-    on_close_callback_.Run();
-    on_close_callback_.Reset();
+    std::move(on_close_callback_).Run();
   }
 }
 

content/browser/renderer_host/pepper/pepper_file_io_host.h

@@ -105,7 +105,7 @@ class PepperFileIOHost : public ppapi::host::ResourceHost,
       UIThreadStuff ui_thread_stuff);
   void DidOpenInternalFile(ppapi::host::ReplyMessageContext reply_context,
                            base::File file,
-                           const base::Closure& on_close_callback);
+                           base::OnceClosure on_close_callback);
   void GotResolvedRenderProcessId(
       ppapi::host::ReplyMessageContext reply_context,
       base::FilePath path,
@@ -145,7 +145,7 @@ class PepperFileIOHost : public ppapi::host::ResourceHost,
   // Valid only for PP_FILESYSTEMTYPE_LOCAL{PERSISTENT,TEMPORARY}.
   scoped_refptr<storage::FileSystemContext> file_system_context_;
   storage::FileSystemURL file_system_url_;
-  base::Closure on_close_callback_;
+  base::OnceClosure on_close_callback_;
   int64_t max_written_offset_;
   bool check_quota_;
 

content/browser/storage_partition_impl_unittest.cc

@@ -455,7 +455,7 @@ class RemovePluginPrivateDataTester {
   void OnFileOpened(base::File* file_result,
                     AwaitCompletionHelper* await_completion,
                     base::File file,
-                    const base::Closure& on_close_callback) {
+                    base::OnceClosure on_close_callback) {
     *file_result = std::move(file);
     await_completion->Notify();
   }

storage/browser/fileapi/async_file_util.h

@@ -54,9 +54,9 @@ class AsyncFileUtil {
   // |on_close_callback| will be called after the |file| is closed in the
   // child process. |on_close_callback|.is_null() can be true, if no operation
   // is needed on closing the file.
-  typedef base::Callback<
-      void(base::File file,
-           const base::Closure& on_close_callback)> CreateOrOpenCallback;
+  typedef base::Callback<void(base::File file,
+                              base::OnceClosure on_close_callback)>
+      CreateOrOpenCallback;
 
   typedef base::Callback<
       void(base::File::Error result,

storage/browser/fileapi/file_system_operation.h

@@ -78,9 +78,9 @@ class FileSystemOperation {
   // Used for OpenFile(). |on_close_callback| will be called after the file is
   // closed in the child process. It can be null, if no operation is needed on
   // closing a file.
-  typedef base::Callback<
-      void(base::File file,
-           const base::Closure& on_close_callback)> OpenFileCallback;
+  typedef base::Callback<void(base::File file,
+                              base::OnceClosure on_close_callback)>
+      OpenFileCallback;
 
   // Used for ReadDirectoryCallback.
   typedef std::vector<DirectoryEntry> FileEntryList;

storage/browser/fileapi/file_system_operation_impl.cc

@@ -40,18 +40,17 @@ namespace {
 // Takes ownership and destruct on the target thread.
 void Destruct(base::File file) {}
 
-void DidOpenFile(
-    scoped_refptr<FileSystemContext> context,
-    base::WeakPtr<FileSystemOperationImpl> operation,
-    const FileSystemOperationImpl::OpenFileCallback& callback,
-    base::File file,
-    const base::Closure& on_close_callback) {
+void DidOpenFile(scoped_refptr<FileSystemContext> context,
+                 base::WeakPtr<FileSystemOperationImpl> operation,
+                 const FileSystemOperationImpl::OpenFileCallback& callback,
+                 base::File file,
+                 base::OnceClosure on_close_callback) {
   if (!operation) {
     context->default_file_task_runner()->PostTask(
         FROM_HERE, base::BindOnce(&Destruct, base::Passed(&file)));
     return;
   }
-  callback.Run(std::move(file), on_close_callback);
+  callback.Run(std::move(file), std::move(on_close_callback));
 }
 
 }  // namespace

storage/browser/fileapi/file_system_operation_runner.cc

@@ -625,16 +625,16 @@ void FileSystemOperationRunner::DidOpenFile(
     const OperationHandle& handle,
     const OpenFileCallback& callback,
     base::File file,
-    const base::Closure& on_close_callback) {
+    base::OnceClosure on_close_callback) {
   if (handle.scope) {
     finished_operations_.insert(handle.id);
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::BindOnce(&FileSystemOperationRunner::DidOpenFile, AsWeakPtr(),
-                       handle, callback, Passed(&file), on_close_callback));
+        FROM_HERE, base::BindOnce(&FileSystemOperationRunner::DidOpenFile,
+                                  AsWeakPtr(), handle, callback, Passed(&file),
+                                  std::move(on_close_callback)));
     return;
   }
-  callback.Run(std::move(file), on_close_callback);
+  callback.Run(std::move(file), std::move(on_close_callback));
   FinishOperation(handle.id);
 }
 

storage/browser/fileapi/file_system_operation_runner.h

@@ -276,11 +276,10 @@ class STORAGE_EXPORT FileSystemOperationRunner
                 base::File::Error rv,
                 int64_t bytes,
                 bool complete);
-  void DidOpenFile(
-      const OperationHandle& handle,
-      const OpenFileCallback& callback,
-      base::File file,
-      const base::Closure& on_close_callback);
+  void DidOpenFile(const OperationHandle& handle,
+                   const OpenFileCallback& callback,
+                   base::File file,
+                   base::OnceClosure on_close_callback);
   void DidCreateSnapshot(
       const OperationHandle& handle,
       const SnapshotFileCallback& callback,