Use base::GetDeleteFileCallback() in more places.

Simplify using PostTask() with base::DeleteFile().

Bug: 1009837
Change-Id: Iedcee91d602d460b80ef9e4079a6602ecd085678
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2204814
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Reviewed-by: David Schinazi <dschinazi@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Yuwei Huang <yuweih@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#778442}

components/component_updater/crl_set_remover.cc

@@ -14,10 +14,9 @@ namespace component_updater {
 void DeleteLegacyCRLSet(const base::FilePath& user_data_dir) {
   base::ThreadPool::PostTask(
       FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()},
-      base::BindOnce(base::IgnoreResult(&base::DeleteFile),
+      base::BindOnce(base::GetDeleteFileCallback(),
                      user_data_dir.Append(
-                         FILE_PATH_LITERAL("Certificate Revocation Lists")),
-                     false));
+                         FILE_PATH_LITERAL("Certificate Revocation Lists"))));
 }
 
 }  // namespace component_updater

components/feedback/feedback_report.cc

@@ -97,8 +97,7 @@ void FeedbackReport::LoadReportsAndQueue(const base::FilePath& user_dir,
 
 void FeedbackReport::DeleteReportOnDisk() {
   reports_task_runner_->PostTask(
-      FROM_HERE,
-      base::BindOnce(base::IgnoreResult(&base::DeleteFile), file_, false));
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), file_));
 }
 
 FeedbackReport::~FeedbackReport() {}

components/omnibox/browser/in_memory_url_index.cc

@@ -203,9 +203,8 @@ void InMemoryURLIndex::OnURLsDeleted(
   // would be odd and confusing.  It's better to force a rebuild.
   base::FilePath path;
   if (needs_to_be_cached_ && GetCacheFilePath(&path))
-    task_runner_->PostTask(
-        FROM_HERE,
-        base::BindOnce(base::IgnoreResult(base::DeleteFile), path, false));
+    task_runner_->PostTask(FROM_HERE,
+                           base::BindOnce(base::GetDeleteFileCallback(), path));
 }
 
 void InMemoryURLIndex::OnHistoryServiceLoaded(
@@ -270,9 +269,8 @@ void InMemoryURLIndex::OnCacheLoadDone(
     base::FilePath path;
     if (!GetCacheFilePath(&path) || shutdown_)
       return;
-    task_runner_->PostTask(
-        FROM_HERE,
-        base::BindOnce(base::IgnoreResult(base::DeleteFile), path, false));
+    task_runner_->PostTask(FROM_HERE,
+                           base::BindOnce(base::GetDeleteFileCallback(), path));
     if (history_service_->backend_loaded()) {
       ScheduleRebuildFromHistory();
     } else {
@@ -368,9 +366,8 @@ void InMemoryURLIndex::PostSaveToCacheFileTask() {
         base::BindOnce(&InMemoryURLIndex::OnCacheSaveDone, AsWeakPtr()));
   } else {
     // If there is no data in our index then delete any existing cache file.
-    task_runner_->PostTask(
-        FROM_HERE,
-        base::BindOnce(base::IgnoreResult(base::DeleteFile), path, false));
+    task_runner_->PostTask(FROM_HERE,
+                           base::BindOnce(base::GetDeleteFileCallback(), path));
   }
 }
 

components/policy/core/common/cloud/user_cloud_policy_store.cc

@@ -128,11 +128,9 @@ void DesktopCloudPolicyStore::Clear() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   background_task_runner()->PostTask(
-      FROM_HERE, base::BindOnce(base::IgnoreResult(&base::DeleteFile),
-                                policy_path_, false));
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), policy_path_));
   background_task_runner()->PostTask(
-      FROM_HERE,
-      base::BindOnce(base::IgnoreResult(&base::DeleteFile), key_path_, false));
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), key_path_));
   policy_.reset();
   policy_map_.Clear();
   policy_signature_public_key_.clear();

components/safe_browsing/core/db/v4_local_database_manager.cc

@@ -652,8 +652,7 @@ void V4LocalDatabaseManager::DeleteUnusedStoreFiles() {
         continue;
       }
       task_runner_->PostTask(
-          FROM_HERE, base::BindOnce(base::IgnoreResult(&base::DeleteFile),
-                                    store_path, false /* recursive */));
+          FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), store_path));
     } else {
       NOTREACHED() << "Trying to delete a store file that's in use: "
                    << store_filename_to_delete;

components/visitedlink/browser/visitedlink_writer.cc

@@ -257,8 +257,8 @@ VisitedLinkWriter::~VisitedLinkWriter() {
     // state. On the next start table will be rebuilt.
     base::FilePath filename;
     GetDatabaseFileName(&filename);
-    PostIOTask(FROM_HERE, base::BindOnce(IgnoreResult(&base::DeleteFile),
-                                         filename, false));
+    PostIOTask(FROM_HERE,
+               base::BindOnce(base::GetDeleteFileCallback(), filename));
   }
 }
 

extensions/browser/api/declarative_net_request/rules_monitor_service.cc

@@ -312,9 +312,8 @@ void RulesMonitorService::OnExtensionUninstalled(
       RulesetSource::CreateDynamic(browser_context, extension->id());
   DCHECK_EQ(source.json_path().DirName(), source.indexed_path().DirName());
   GetExtensionFileTaskRunner()->PostTask(
-      FROM_HERE,
-      base::BindOnce(base::IgnoreResult(&base::DeleteFile),
-                     source.json_path().DirName(), false /* recursive */));
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(),
+                                source.json_path().DirName()));
 }
 
 void RulesMonitorService::UpdateDynamicRulesInternal(

net/url_request/url_fetcher_response_writer.cc

@@ -166,8 +166,7 @@ void URLFetcherFileWriter::CloseAndDeleteFile() {
   file_stream_.reset();
   DisownFile();
   file_task_runner_->PostTask(
-      FROM_HERE, base::BindOnce(base::IgnoreResult(&base::DeleteFile),
-                                file_path_, false /* recursive */));
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), file_path_));
 }
 
 void URLFetcherFileWriter::DidCreateTempFile(base::FilePath* temp_file_path,

remoting/host/file_transfer/local_file_operations.cc

@@ -361,8 +361,8 @@ void LocalFileWriter::Cancel() {
   // And finally, queue deletion of the temp file.
   if (!temp_filepath_.empty()) {
     file_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(base::IgnoreResult(&base::DeleteFile),
-                                  temp_filepath_, false /* recursive */));
+        FROM_HERE,
+        base::BindOnce(base::GetDeleteFileCallback(), temp_filepath_));
   }
   SetState(FileOperations::kFailed);
 }

remoting/host/security_key/security_key_auth_handler_posix.cc

@@ -154,9 +154,8 @@ SecurityKeyAuthHandlerPosix::~SecurityKeyAuthHandlerPosix() {
   if (file_task_runner_) {
     // Attempt to clean up the socket before being destroyed.
     file_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(base::IgnoreResult(&base::DeleteFile),
-                                  g_security_key_socket_name.Get(),
-                                  /*recursive=*/false));
+        FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(),
+                                  g_security_key_socket_name.Get()));
   }
 }
 
@@ -170,9 +169,8 @@ void SecurityKeyAuthHandlerPosix::CreateSecurityKeyConnection() {
   // resume setting up our security key auth socket there.
   file_task_runner_->PostTaskAndReply(
       FROM_HERE,
-      base::BindOnce(base::IgnoreResult(&base::DeleteFile),
-                     g_security_key_socket_name.Get(),
-                     /*recursive=*/false),
+      base::BindOnce(base::GetDeleteFileCallback(),
+                     g_security_key_socket_name.Get()),
       base::BindOnce(&SecurityKeyAuthHandlerPosix::CreateSocket,
                      weak_factory_.GetWeakPtr()));
 }

storage/browser/blob/scoped_file.cc

@@ -69,8 +69,7 @@ void ScopedFile::Reset() {
 
   if (scope_out_policy_ == DELETE_ON_SCOPE_OUT) {
     file_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(base::IgnoreResult(&base::DeleteFile), path_,
-                                  false /* recursive */));
+        FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), path_));
   }
 
   // Clear all fields.