Improve process launch handle sharing API.

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"
@@ skipping 133 matching lines @@
 ChromeCleanerRunner::ProcessStatus
 ChromeCleanerRunner::LaunchAndWaitForExitOnBackgroundThread() {
   mojo::edk::OutgoingBrokerClientInvitation invitation;
   std::string mojo_pipe_token = mojo::edk::GenerateRandomToken();
   mojo::ScopedMessagePipeHandle mojo_pipe =
       invitation.AttachMessagePipe(mojo_pipe_token);
   cleaner_command_line_.AppendSwitchASCII(
       chrome_cleaner::kChromeMojoPipeTokenSwitch, mojo_pipe_token);
 
   mojo::edk::PlatformChannelPair channel;
-  base::HandlesToInheritVector handles_to_inherit;
-  channel.PrepareToPassClientHandleToChildProcess(&cleaner_command_line_,
-                                                  &handles_to_inherit);
   base::LaunchOptions launch_options;
-  launch_options.handles_to_inherit = &handles_to_inherit;
+  channel.PrepareToPassClientHandleToChildProcess(
+      &cleaner_command_line_, &launch_options.handles_to_inherit);
 
   base::Process cleaner_process =
       g_test_delegate
           ? g_test_delegate->LaunchTestProcess(cleaner_command_line_,
                                                launch_options)
           : base::LaunchProcess(cleaner_command_line_, launch_options);
 
   if (!cleaner_process.IsValid())
     return ProcessStatus(LaunchStatus::kLaunchFailed);
 
@@ skipping 59 matching lines @@
         FROM_HERE, base::BindOnce(std::move(on_process_done_), process_status));
   }
 }
 
 void SetChromeCleanerRunnerTestDelegateForTesting(
     ChromeCleanerRunnerTestDelegate* test_delegate) {
   g_test_delegate = test_delegate;
 }
 
 }  // namespace safe_browsing