Use base::GetDeleteFileCallback() in more places in chrome/.

Replace existing code that does exactly the same thing.

Bug: 1009837
Change-Id: I7f2612bbc03301bf1b43c42c153ab2f795a82616
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285849Reviewed-by: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
Reviewed-by: Joe Mason <joenotcharles@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790520}

chrome/browser/browser_switcher/browser_switcher_service_win.cc

@@ -112,10 +112,6 @@ void SaveDataToFile(const std::string& data, base::FilePath path) {
   UMA_HISTOGRAM_BOOLEAN("BrowserSwitcher.CacheFile.MoveSuccess", success);
 }
 
-void RemoveFile(base::FilePath path) {
-  base::DeleteFile(path, false);
-}
-
 // URL to fetch the IEEM sitelist from. Only used for testing.
 base::Optional<std::string>* IeemSitelistUrlForTesting() {
   static base::NoDestructor<base::Optional<std::string>>
@@ -263,7 +259,7 @@ void BrowserSwitcherServiceWin::DeletePrefsFile() {
     return;
   path = path.AppendASCII("cache.dat");
   sequenced_task_runner_->PostTaskAndReply(
-      FROM_HERE, base::BindOnce(&RemoveFile, std::move(path)),
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), std::move(path)),
       base::BindOnce(&BrowserSwitcherServiceWin::CacheFileUpdated,
                      weak_ptr_factory_.GetWeakPtr()));
 }
@@ -288,7 +284,7 @@ void BrowserSwitcherServiceWin::DeleteSitelistCacheFile() {
     return;
   path = path.AppendASCII("sitelistcache.dat");
   sequenced_task_runner_->PostTaskAndReply(
-      FROM_HERE, base::BindOnce(&RemoveFile, std::move(path)),
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), std::move(path)),
       base::BindOnce(&BrowserSwitcherServiceWin::SitelistCacheFileUpdated,
                      weak_ptr_factory_.GetWeakPtr()));
 }

chrome/chrome_cleaner/os/disk_util_unittest.cc

@@ -838,11 +838,8 @@ TEST(DiskUtilTests, ZoneIdentifierWhenProcessIsRunning) {
   base::FilePath target_exe_path(executable_path.Append(target_exe_name));
 
   ASSERT_TRUE(base::CopyFile(source_exe_path, target_exe_path));
-  base::ScopedClosureRunner delete_temp_file(base::BindOnce(
-      [](const base::FilePath& temp_file) {
-        base::DeleteFile(temp_file, /*recursive=*/false);
-      },
-      target_exe_path));
+  base::ScopedClosureRunner delete_temp_file(
+      base::BindOnce(base::GetDeleteFileCallback(), target_exe_path));
 
   // Launch the test_process and wait it's completion. The process must set its
   // zone identifier.