Chrome Cleaner UI: reporter no longer uses mojo.

chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc

Index: chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d2b8424bda13ee6a05ada6e7845bc019cb5c5414
--- /dev/null
+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
@@ -0,0 +1,250 @@
+// 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 "base/threading/thread_task_runner_handle.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;
+
+}  // namespace
+
+// static
+void ChromeCleanerRunner::RunChromeCleanerAndReplyWithExitCode(
+    const base::FilePath& executable_path,
+    const SwReporterInvocation& reporter_invocation,
+    ChromeMetricsStatus metrics_status,
+    CleanerLogsStatus cleaner_logs_status,
+    ChromePromptImpl::OnPromptUser on_prompt_user,
+    base::OnceClosure on_connection_closed,
+    ChromeCleanerRunner::ProcessDoneCallback on_process_done) {
+  auto cleaner_runner = make_scoped_refptr(new ChromeCleanerRunner(
+      executable_path, reporter_invocation, metrics_status, cleaner_logs_status,
+      std::move(on_prompt_user), std::move(on_connection_closed),
+      std::move(on_process_done), base::ThreadTaskRunnerHandle::Get()));

[Joe Mason, 2017/05/23 15:39:35]

I think it makes sense to either use BrowserThread::UI explicitly since the
caller of this requires that functions be called on the UI thread, or
sequenced_task_runner since this code itself doesn't depend on running on a
single thread (and so if the caller needs functions to be called on a specific
thread, it's the caller's responsibility to pass that thread's task_runner).

[alito, 2017/05/23 18:58:56]

As discussed, the static function will now let the caller provide it with a
sequenced task runner where all callbacks are posted to.

+  auto launch_and_wait = base::BindOnce(
+      &ChromeCleanerRunner::LaunchAndWaitForExitOnBackgroundThread,
+      cleaner_runner);
+  auto process_done =
+      base::BindOnce(&ChromeCleanerRunner::OnProcessDone, cleaner_runner);
+  base::PostTaskWithTraitsAndReplyWithResult(
+      FROM_HERE,
+      // LaunchAndWaitForExitOnBackgroundThread creates (MayBlock()) and joins
+      // (WithBaseSyncPrimitives()) a process.
+      {base::MayBlock(), base::WithBaseSyncPrimitives(),
+       base::TaskPriority::BACKGROUND,
+       base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
+      std::move(launch_and_wait), std::move(process_done));
+}
+
+ChromeCleanerRunner::ChromeCleanerRunner(
+    const base::FilePath& executable_path,
+    const SwReporterInvocation& reporter_invocation,
+    ChromeMetricsStatus metrics_status,
+    CleanerLogsStatus cleaner_logs_status,
+    ChromePromptImpl::OnPromptUser on_prompt_user,
+    base::OnceClosure on_connection_closed,
+    ProcessDoneCallback on_process_done,
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner)
+    : task_runner_(task_runner),
+      command_line_(executable_path),
+      on_prompt_user_(std::move(on_prompt_user)),
+      on_connection_closed_(std::move(on_connection_closed)),
+      on_process_done_(std::move(on_process_done)) {
+  DCHECK(base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature));
+  DCHECK(on_prompt_user_);
+  DCHECK(on_connection_closed_);
+  DCHECK(on_process_done_);
+  DCHECK(!executable_path.empty());
+
+  if (g_test_delegate)
+    command_line_ = g_test_delegate->GetTestBaseCommandLine();
+
+  // Add the non-IPC switches that should be passed to the Cleaner process.
+
+  // Add switches that pass information about this Chrome installation.
+  command_line_.AppendSwitchASCII(chrome_cleaner::kChromeVersionSwitch,
+                                  version_info::GetVersionNumber());
+  command_line_.AppendSwitchASCII(chrome_cleaner::kChromeChannelSwitch,
+                                  base::IntToString(ChannelAsInt()));
+  base::FilePath chrome_exe_path;
+  PathService::Get(base::FILE_EXE, &chrome_exe_path);
+  command_line_.AppendSwitchPath(chrome_cleaner::kChromeExePathSwitch,
+                                 chrome_exe_path);
+  if (!InstallUtil::IsPerUserInstall())
+    command_line_.AppendSwitch(chrome_cleaner::kChromeSystemInstallSwitch);
+
+  // Start the cleaner process in scanning mode.
+  command_line_.AppendSwitchASCII(
+      chrome_cleaner::kExecutionModeSwitch,
+      base::IntToString(
+          static_cast<int>(chrome_cleaner::ExecutionMode::kScanning)));
+
+  // If set, forward the engine flag from the reporter. Otherwise, set the
+  // engine flag explicitly to 1.
+  command_line_.AppendSwitchASCII(
+      chrome_cleaner::kEngineSwitch,
+      reporter_invocation.command_line.HasSwitch(chrome_cleaner::kEngineSwitch)
+          ? reporter_invocation.command_line.GetSwitchValueASCII(
+                chrome_cleaner::kEngineSwitch)
+          : base::IntToString(1));
+
+  // If metrics is enabled, we can enable crash reporting in the Chrome Cleaner
+  // process.
+  if (metrics_status == ChromeMetricsStatus::kEnabled) {
+    command_line_.AppendSwitch(chrome_cleaner::kUmaUserSwitch);
+    command_line_.AppendSwitch(chrome_cleaner::kEnableCrashReportingSwitch);
+  }
+
+  // Enable logs upload for users who have opted into safe browsing extended
+  // reporting v2.
+  if (cleaner_logs_status == CleanerLogsStatus::kUploadEnabled)
+    command_line_.AppendSwitch(chrome_cleaner::kEnableCleanerLoggingSwitch);
+}
+
+ChromeCleanerRunner::LaunchStatus
+ChromeCleanerRunner::LaunchAndWaitForExitOnBackgroundThread() {
+  constexpr int kBadProcessExitCode = std::numeric_limits<int>::max();
+
+  mojo::edk::OutgoingBrokerClientInvitation invitation;
+  std::string mojo_pipe_token = mojo::edk::GenerateRandomToken();
+  mojo::ScopedMessagePipeHandle mojo_pipe =
+      invitation.AttachMessagePipe(mojo_pipe_token);
+  command_line_.AppendSwitchASCII(chrome_cleaner::kChromeMojoPipeTokenSwitch,
+                                  mojo_pipe_token);
+
+  mojo::edk::PlatformChannelPair channel;
+  base::HandlesToInheritVector handles_to_inherit;
+  channel.PrepareToPassClientHandleToChildProcess(&command_line_,
+                                                  &handles_to_inherit);
+  base::LaunchOptions launch_options;
+  launch_options.handles_to_inherit = &handles_to_inherit;
+
+  base::Process cleaner_process =
+      g_test_delegate
+          ? g_test_delegate->LaunchTestProcess(command_line_, launch_options)
+          : base::LaunchProcess(command_line_, launch_options);
+
+  if (!cleaner_process.IsValid())
+    return {false, kBadProcessExitCode};
+
+  // ChromePromptImpl tasks will need to run on the IO thread. There is no
+  // need to synchronize its creation, since the client end will wait for this
+  // initialization to be done before sending requests.
+  BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
+      ->PostTask(FROM_HERE,
+                 base::BindOnce(&ChromeCleanerRunner::CreateChromePromptImpl,
+                                base::RetainedRef(this),
+                                chrome_cleaner::mojom::ChromePromptRequest(
+                                    std::move(mojo_pipe))));
+
+  // TODO(alito): Consider if we need to pass in a process error callback the
+  //     Send() function.

[Joe Mason, 2017/05/23 15:39:35]

I would say no. There's no point in having this until we design what's done when
a message fails validation. This is a natural thing to file a separate bug for.

[alito, 2017/05/23 18:58:56]

Removed this comment and opened crbug.com/725570. Added as much detail as is
available to me right now in the bug description.

+  invitation.Send(
+      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() {
+  DCHECK(!chrome_prompt_impl_);
+}
+
+void ChromeCleanerRunner::CreateChromePromptImpl(
+    ChromePromptRequest chrome_prompt_request) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(!chrome_prompt_impl_);
+
+  chrome_prompt_impl_ = base::MakeUnique<ChromePromptImpl>(
+      std::move(chrome_prompt_request),
+      base::Bind(&ChromeCleanerRunner::OnConnectionClosed,
+                 base::RetainedRef(this)),
+      base::Bind(&ChromeCleanerRunner::OnPromptUser, base::RetainedRef(this)));
+  // Ensure that this object is not destroyed before chrome_prompt_impl_ has
+  // been released in ReleaseChromePromptImpl(). This is a bit paranoid, but
+  // better safe than sorry.
+  AddRef();

[Joe Mason, 2017/05/23 15:39:35]

Nice solution.

[alito, 2017/05/23 18:58:56]

Thx :).

+}
+
+void ChromeCleanerRunner::ReleaseChromePromptImpl() {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(chrome_prompt_impl_);
+  chrome_prompt_impl_.release();
+  // Balanced by the call to AddRef() in CreateChromePromptImpl().
+  Release();
+}
+
+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)));
+  }
+}
+
+void ChromeCleanerRunner::OnConnectionClosed() {
+  BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
+      ->PostTask(FROM_HERE,
+                 base::Bind(&ChromeCleanerRunner::ReleaseChromePromptImpl,
+                            base::RetainedRef(this)));
+
+  if (on_connection_closed_)
+    task_runner_->PostTask(FROM_HERE, std::move(on_connection_closed_));
+}
+
+void ChromeCleanerRunner::OnProcessDone(LaunchStatus launch_status) {
+  if (on_process_done_) {
+    task_runner_->PostTask(
+        FROM_HERE, base::BindOnce(std::move(on_process_done_), launch_status));
+  }
+}
+
+void SetChromeCleanerRunnerTestDelegateForTesting(
+    ChromeCleanerRunnerTestDelegate* test_delegate) {
+  g_test_delegate = test_delegate;
+}
+
+}  // namespace safe_browsing