Remove explicit task runner references from MaybeExecuteSRTFromBlockingPool

chrome/browser/safe_browsing/srt_global_error_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/srt_global_error_win.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_scheduler/post_task.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/safe_browsing/srt_client_info_win.h"
 #include "chrome/browser/safe_browsing/srt_field_trial_win.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/install_util.h"
 #include "components/chrome_cleaner/public/constants/constants.h"
 #include "components/component_updater/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/version_info/version_info.h"
-#include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using base::SingleThreadTaskRunner;
-using base::ThreadTaskRunnerHandle;
-using content::BrowserThread;
-
 namespace safe_browsing {
 
 namespace {
 
 // Used as a backup plan in case the SRT executable was not successfully
 // downloaded or run.
 const char kSRTDownloadURL[] =
     "https://www.google.com/chrome/srt/?chrome-prompt=1";
 
 // The extension to use to replace the temporary one created when the SRT was
 // downloaded.
 const base::FilePath::CharType kExecutableExtension[] = L"exe";
 
-void MaybeExecuteSRTFromBlockingPool(
+bool MaybeExecuteSRTFromBlockingPool(
     const base::FilePath& downloaded_path,
     bool metrics_enabled,
     bool sber_enabled,
-    chrome_cleaner::ChromePromptValue prompt_value,
-    const scoped_refptr<SingleThreadTaskRunner>& task_runner,
-    const base::Closure& success_callback,
-    const base::Closure& failure_callback) {
+    chrome_cleaner::ChromePromptValue prompt_value) {
   DCHECK(!downloaded_path.empty());
 
   if (base::PathExists(downloaded_path)) {
     base::FilePath executable_path(
         downloaded_path.ReplaceExtension(kExecutableExtension));
     if (base::ReplaceFile(downloaded_path, executable_path, nullptr)) {
       base::CommandLine srt_command_line(executable_path);
       srt_command_line.AppendSwitchASCII(
           chrome_cleaner::kChromePromptSwitch,
           base::IntToString(static_cast<int>(prompt_value)));
@@ skipping 15 matching lines @@
         srt_command_line.AppendSwitch(
             chrome_cleaner::kEnableCrashReportingSwitch);
       }
 
       if (sber_enabled)
         srt_command_line.AppendSwitch(
             chrome_cleaner::kExtendedSafeBrowsingEnabledSwitch);
 
       base::Process srt_process(
           base::LaunchProcess(srt_command_line, base::LaunchOptions()));
-      if (srt_process.IsValid()) {
-        task_runner->PostTask(FROM_HERE, success_callback);
-        return;
-      }
+      return srt_process.IsValid();
     }
   }
-
-  task_runner->PostTask(FROM_HERE, failure_callback);
+  return false;
 }
 
 void DeleteFilesFromBlockingPool(const base::FilePath& downloaded_path) {
   base::DeleteFile(downloaded_path, false);
   base::DeleteFile(downloaded_path.ReplaceExtension(kExecutableExtension),
                    false);
 }
 
 }  // namespace
 
@@ skipping 98 matching lines @@
 }
 
 void SRTGlobalError::MaybeExecuteSRT() {
   if (downloaded_path_.empty()) {
     FallbackToDownloadPage();
     return;
   }
   // At this point, this object owns itself, since ownership has been taken back
   // from the global_error_service_ in the call to OnUserInteractionStarted.
   // This means that it is safe to use base::Unretained here.
-  base::PostTaskWithTraits(
+  base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE,
       base::TaskTraits().MayBlock().WithPriority(
           base::TaskPriority::BACKGROUND),
       base::Bind(
           &MaybeExecuteSRTFromBlockingPool, downloaded_path_,
           ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(),
           SafeBrowsingExtendedReportingEnabled(),
           bubble_shown_from_menu_
               ? chrome_cleaner::ChromePromptValue::kShownFromMenu
-              : chrome_cleaner::ChromePromptValue::kPrompted,
-          base::ThreadTaskRunnerHandle::Get(),
-          base::Bind(&SRTGlobalError::OnUserinteractionDone,
-                     base::Unretained(this)),
-          base::Bind(&SRTGlobalError::FallbackToDownloadPage,
-                     base::Unretained(this))));
+              : chrome_cleaner::ChromePromptValue::kPrompted),
+      base::Bind(
+          [](SRTGlobalError* self, bool success) {
+            if (success)
+              self->OnUserinteractionDone();
+            else
+              self->FallbackToDownloadPage();
+          },
+          base::Unretained(this)));
 }
 
 void SRTGlobalError::FallbackToDownloadPage() {
   RecordSRTPromptHistogram(SRT_PROMPT_FALLBACK);
 
   Browser* browser = chrome::FindLastActive();
   if (browser) {
     browser->OpenURL(
         content::OpenURLParams(GURL(kSRTDownloadURL), content::Referrer(),
                                WindowOpenDisposition::NEW_FOREGROUND_TAB,
@@ skipping 24 matching lines @@
 void SRTGlobalError::OnUserinteractionDone() {
   DCHECK(interacted_);
   // Once the user interacted with the bubble, we can forget about any pending
   // prompt.
   g_browser_process->local_state()->SetBoolean(prefs::kSwReporterPendingPrompt,
                                                false);
   delete this;
 }
 
 }  // namespace safe_browsing