Adds error handling support for the SwReporter launcher.

chrome/browser/safe_browsing/srt_fetcher_win.cc

 // Copyright 2015 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_fetcher_win.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 17 matching lines @@
 #include "base/task_runner_util.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/task_scheduler/task_traits.h"
 #include "base/time/time.h"
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/safe_browsing/srt_chrome_prompt_impl.h"
 #include "chrome/browser/safe_browsing/srt_client_info_win.h"
 #include "chrome/browser/safe_browsing/srt_global_error_win.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/chrome_cleaner/public/constants/constants.h"
 #include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h"
@@ skipping 535 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<SwReporterProcess>;
   ~SwReporterProcess() = default;
 
   // Starts a new IPC service implementing the ChromePrompt interface and
   // launches a new reporter process that can connect to the IPC.
   base::Process LaunchConnectedReporterProcess();
 
   // Starts a new instance of ChromePromptImpl to receive requests from the
-  // reporter. Must be run on the IO thread.
+  // reporter and establishes the mojo connection to it.
+  // Must be run on the IO thread.
   void CreateChromePromptImpl(
+      base::ProcessHandle process,
+      mojo::edk::ConnectionParams connection_params,
+      std::unique_ptr<mojo::edk::PendingProcessConnection>
+          pending_process_connection,
       chrome_cleaner::mojom::ChromePromptRequest chrome_prompt_request);
 
   // Releases the instance of ChromePromptImpl. Must be run on the IO thread.
   void ReleaseChromePromptImpl();
 
   // Launches a new process with the command line in the invocation and
   // provided launch options. Uses g_testing_delegate_ if not null.
   base::Process LaunchReporterProcess(
       const SwReporterInvocation& invocation,
       const base::LaunchOptions& launch_options);
 
   // The invocation for the current reporter process.
   SwReporterInvocation invocation_;
 
   // Implementation of the ChromePrompt service to be used by the current
   // reporter process. Can only be accessed on the IO thread.
   std::unique_ptr<ChromePromptImpl> chrome_prompt_impl_;
 };
 
 int SwReporterProcess::LaunchAndWaitForExitOnBackgroundThread() {
   base::Process reporter_process =
       base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature)
           ? LaunchConnectedReporterProcess()
           : LaunchReporterProcess(invocation_, base::LaunchOptions());
 
   // This exit code is used to identify that a reporter run didn't happen, so
   // the result should be ignored and a rerun scheduled for the usual delay.
-  int exit_code = kReporterFailureExitCode;
+  int exit_code = kReporterNotLaunchedExitCode;
   UMAHistogramReporter uma(invocation_.suffix);
   if (reporter_process.IsValid()) {
     uma.RecordReporterStep(SW_REPORTER_START_EXECUTION);
     bool success = reporter_process.WaitForExit(&exit_code);
     DCHECK(success);
   } else {
     uma.RecordReporterStep(SW_REPORTER_FAILED_TO_START);
   }
   return exit_code;
 }
 
 void SwReporterProcess::OnReporterDone() {
   if (base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature)) {
     BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
         ->PostTask(FROM_HERE,
                    base::Bind(&SwReporterProcess::ReleaseChromePromptImpl,
                               base::RetainedRef(this)));
   }
 }
 
 base::Process SwReporterProcess::LaunchConnectedReporterProcess() {
   DCHECK(base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature));
 
-  mojo::edk::PendingProcessConnection pending_process_connection;
+  std::unique_ptr<mojo::edk::PendingProcessConnection>
+      pending_process_connection =
+          base::MakeUnique<mojo::edk::PendingProcessConnection>();
   std::string mojo_pipe_token;
   mojo::ScopedMessagePipeHandle mojo_pipe =
-      pending_process_connection.CreateMessagePipe(&mojo_pipe_token);
+      pending_process_connection->CreateMessagePipe(&mojo_pipe_token);
   invocation_.command_line.AppendSwitchASCII(
       chrome_cleaner::kChromeMojoPipeTokenSwitch, mojo_pipe_token);
   invocation_.command_line.AppendSwitchASCII(
       chrome_cleaner::kExecutionModeSwitch,
       base::IntToString(
           static_cast<int>(chrome_cleaner::ExecutionMode::kScanning)));
 
   mojo::edk::PlatformChannelPair channel;
   base::HandlesToInheritVector handles_to_inherit;
   channel.PrepareToPassClientHandleToChildProcess(&invocation_.command_line,
                                                   &handles_to_inherit);
 
   base::LaunchOptions launch_options;
   launch_options.handles_to_inherit = &handles_to_inherit;
   base::Process reporter_process =
       LaunchReporterProcess(invocation_, launch_options);
 
   if (!reporter_process.IsValid())
     return reporter_process;
 
-  pending_process_connection.Connect(
-      reporter_process.Handle(),
-      mojo::edk::ConnectionParams(channel.PassServerHandle()));
-
   chrome_cleaner::mojom::ChromePromptRequest chrome_prompt_request;
   chrome_prompt_request.Bind(std::move(mojo_pipe));
 
   // 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.
+  // It's safe to pass the process handle here

[Joe Mason, 2017/04/24 14:53:48]

Nit: End this line with a period, and either put it on the same line as the
previous sentence or add a blank line to separate paragraphs.

[ftirelo, 2017/04/24 15:47:46]

This was still wip, not needed anymore.

   BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
       ->PostTask(FROM_HERE,
-                 base::BindOnce(&SwReporterProcess::CreateChromePromptImpl,
-                                base::RetainedRef(this),
-                                std::move(chrome_prompt_request)));
+                 base::BindOnce(
+                     &SwReporterProcess::CreateChromePromptImpl,
+                     base::RetainedRef(this), reporter_process.Handle(),
+                     mojo::edk::ConnectionParams(channel.PassServerHandle()),
+                     std::move(pending_process_connection),
+                     std::move(chrome_prompt_request)));
 
   return reporter_process;
 }
 
 base::Process SwReporterProcess::LaunchReporterProcess(
     const SwReporterInvocation& invocation,
     const base::LaunchOptions& launch_options) {
   return g_testing_delegate_
              ? g_testing_delegate_->LaunchReporter(invocation, launch_options)
              : base::LaunchProcess(invocation.command_line, launch_options);
 }
 
 void SwReporterProcess::CreateChromePromptImpl(
+    base::ProcessHandle process,
+    mojo::edk::ConnectionParams connection_params,
+    std::unique_ptr<mojo::edk::PendingProcessConnection>
+        pending_process_connection,
     chrome_cleaner::mojom::ChromePromptRequest chrome_prompt_request) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature));
 
-  chrome_prompt_impl_ =
-      base::MakeUnique<ChromePromptImpl>(std::move(chrome_prompt_request));
+  chrome_prompt_impl_ = g_testing_delegate_
+                            ? g_testing_delegate_->CreateChromePromptImpl(
+                                  std::move(chrome_prompt_request))
+                            : base::MakeUnique<ChromePromptImpl>(
+                                  std::move(chrome_prompt_request));
+
+  pending_process_connection->Connect(
+      process, std::move(connection_params),
+      base::Bind(&ChromePromptImpl::OnConnectionError,
+                 base::Unretained(chrome_prompt_impl_.get())));

[Joe Mason, 2017/04/24 14:53:48]

Because I know grt will ask: please add a comment explaining why Unretained is
safe here.

[ftirelo, 2017/04/24 15:47:46]

Obsolete.

[grt (UTC plus 2), 2017/04/25 07:06:39]

Impact! Influence! ;-)

 }
 
 void SwReporterProcess::ReleaseChromePromptImpl() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature));
 
   chrome_prompt_impl_.release();
 }
 
 }  // namespace
@@ skipping 212 matching lines @@
                     scoped_refptr<SwReporterProcess> sw_reporter_process,
                     int exit_code) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     sw_reporter_process->OnReporterDone();
 
     base::Time now = Now();
     base::TimeDelta reporter_running_time = now - reporter_start_time;
 
     // Don't continue the current queue of reporters if one failed to launch.
-    if (exit_code == kReporterFailureExitCode)
+    if (exit_code == kReporterNotLaunchedExitCode)
       current_invocations_ = SwReporterQueue();
 
     // As soon as we're not running this queue, schedule the next overall queue
     // run after the regular delay. (If there was a failure it's not worth
     // retrying earlier, risking running too often if it always fails, since
     // not many users fail here.)
     if (current_invocations_.empty()) {
       base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE,
           base::Bind(&ReporterRunner::TryToRun, base::Unretained(this)),
           base::TimeDelta::FromDays(days_between_reporter_runs_));
     } else {
       ScheduleNextInvocation();
     }
 
     // If the reporter failed to launch, do not process the results. (The exit
     // code itself doesn't need to be logged in this case because
     // SW_REPORTER_FAILED_TO_START is logged in
     // |LaunchAndWaitForExitOnBackgroundThread|.)
-    if (exit_code == kReporterFailureExitCode)
+    if (exit_code == kReporterNotLaunchedExitCode)
       return;
 
     const auto& finished_invocation = sw_reporter_process->invocation();
     UMAHistogramReporter uma(finished_invocation.suffix);
     uma.ReportVersion(version);
     uma.ReportExitCode(exit_code);
     uma.ReportEngineErrorCode();
     uma.ReportFoundUwS();
 
     PrefService* local_state = g_browser_process->local_state();
@@ skipping 253 matching lines @@
   return srt_cleaner_key.Open(HKEY_CURRENT_USER, cleaner_key_path.c_str(),
                               KEY_QUERY_VALUE) == ERROR_SUCCESS &&
          srt_cleaner_key.GetValueCount() > 0;
 }
 
 void SetSwReporterTestingDelegate(SwReporterTestingDelegate* delegate) {
   g_testing_delegate_ = delegate;
 }
 
 }  // namespace safe_browsing