Chrome Cleaner UI: Use BrowserThread's DeleteOnIOThread for ChromePromptImpl

chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc

 // Copyright 2017 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/chrome_cleaner/chrome_cleaner_runner_win.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/feature_list.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h"
 #include "chrome/installer/util/install_util.h"
 #include "components/chrome_cleaner/public/constants/constants.h"
 #include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h"
 #include "components/version_info/version_info.h"
-#include "content/public/browser/browser_thread.h"
 #include "mojo/edk/embedder/connection_params.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/outgoing_broker_client_invitation.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/transport_protocol.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 using chrome_cleaner::mojom::ChromePrompt;
 using chrome_cleaner::mojom::ChromePromptRequest;
 using content::BrowserThread;
 
 namespace safe_browsing {
 
 namespace {
 
 // Global delegate used to override the launching of the Cleaner process during
 // tests.
 ChromeCleanerRunnerTestDelegate* g_test_delegate = nullptr;
 
-void ReleaseChromePromptImpl(
-    std::unique_ptr<ChromePromptImpl> chrome_prompt_impl) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(chrome_prompt_impl);
-  chrome_prompt_impl.reset();
-}
-
 }  // namespace
 
 // static
 void ChromeCleanerRunner::RunChromeCleanerAndReplyWithExitCode(
     const base::FilePath& cleaner_executable_path,
     const SwReporterInvocation& reporter_invocation,
     ChromeMetricsStatus metrics_status,
     CleanerLogsStatus cleaner_logs_status,
     ChromePromptImpl::OnPromptUser on_prompt_user,
     base::OnceClosure on_connection_closed,
@@ skipping 124 matching lines @@
       cleaner_process.Handle(),
       mojo::edk::ConnectionParams(mojo::edk::TransportProtocol::kLegacy,
                                   channel.PassServerHandle()));
 
   int exit_code = kBadProcessExitCode;
   if (cleaner_process.WaitForExit(&exit_code))
     return {true, exit_code};
   return {false, kBadProcessExitCode};
 }
 
-ChromeCleanerRunner::~ChromeCleanerRunner() {
-  if (chrome_prompt_impl_) {
-    BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
-        ->PostTask(FROM_HERE, base::Bind(&ReleaseChromePromptImpl,
-                                         base::Passed(&chrome_prompt_impl_)));
-  }
-}
+ChromeCleanerRunner::~ChromeCleanerRunner() = default;
 
 void ChromeCleanerRunner::CreateChromePromptImpl(
     ChromePromptRequest chrome_prompt_request) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!chrome_prompt_impl_);
 
-  chrome_prompt_impl_ = base::MakeUnique<ChromePromptImpl>(
+  // Cannot use base::MakeUnique() since it does not support creating
+  // std::unique_ptrs with custom deleters.
+  chrome_prompt_impl_.reset(new ChromePromptImpl(
       std::move(chrome_prompt_request),
       base::Bind(&ChromeCleanerRunner::OnConnectionClosed,
                  base::RetainedRef(this)),
-      base::Bind(&ChromeCleanerRunner::OnPromptUser, base::RetainedRef(this)));
+      base::Bind(&ChromeCleanerRunner::OnPromptUser, base::RetainedRef(this))));
 }
 
 void ChromeCleanerRunner::OnPromptUser(
     std::unique_ptr<std::set<base::FilePath>> files_to_delete,
     ChromePrompt::PromptUserCallback prompt_user_callback) {
   if (on_prompt_user_) {
     task_runner_->PostTask(FROM_HERE,
                            base::BindOnce(std::move(on_prompt_user_),
                                           base::Passed(&files_to_delete),
                                           base::Passed(&prompt_user_callback)));
@@ skipping 11 matching lines @@
         FROM_HERE, base::BindOnce(std::move(on_process_done_), launch_status));
   }
 }
 
 void SetChromeCleanerRunnerTestDelegateForTesting(
     ChromeCleanerRunnerTestDelegate* test_delegate) {
   g_test_delegate = test_delegate;
 }
 
 }  // namespace safe_browsing