Improve process launch handle sharing API.

chrome/test/base/mojo_test_connector.cc

 // Copyright 2016 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/test/base/mojo_test_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 38 matching lines @@
                 base::TestLauncher::LaunchOptions* test_launch_options,
                 const std::string& mus_config_switch)
       : connector_(connector),
         background_service_manager_(nullptr),
         platform_channel_(base::MakeUnique<mojo::edk::PlatformChannelPair>()),
         main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
         weak_factory_(this) {
     command_line->AppendSwitch(MojoTestConnector::kTestSwitch);
     command_line->AppendSwitchASCII(switches::kMusConfig, mus_config_switch);
 
+#if defined(OS_WIN)
     platform_channel_->PrepareToPassClientHandleToChildProcess(
-        command_line, &handle_passing_info_);
-#if defined(OS_WIN)
-    test_launch_options->inherit_handles = true;
-    test_launch_options->handles_to_inherit = &handle_passing_info_;
-#if defined(OFFICIAL_BUILD)
-    CHECK(false) << "Launching mojo process with inherit_handles is insecure!";
-#endif
+        command_line, &test_launch_options->handles_to_inherit);
 #elif defined(OS_POSIX)
-    test_launch_options->fds_to_remap = &handle_passing_info_;
+    platform_channel_->PrepareToPassClientHandleToChildProcess(
+        command_line, &test_launch_options->fds_to_remap);
 #else
 #error "Unsupported"
 #endif
 
     // Create the pipe token, as it must be passed to children processes via the
     // command line.
     service_ = service_manager::PassServiceRequestOnCommandLine(
         &broker_client_invitation_, command_line);
   }
 
@@ skipping 44 matching lines @@
   mojo::edk::OutgoingBrokerClientInvitation broker_client_invitation_;
   MojoTestConnector* connector_;
   std::unique_ptr<service_manager::BackgroundServiceManager>
       background_service_manager_;
 
   // The ServicePtr must be created before child process launch so that the pipe
   // can be set on the command line. It is held until SetupService is called at
   // which point |background_service_manager_| takes over ownership.
   service_manager::mojom::ServicePtr service_;
 
-  // NOTE: HandlePassingInformation must remain valid through process launch,
-  // hence it lives here instead of within Init()'s stack.
-  mojo::edk::HandlePassingInformation handle_passing_info_;
-
   std::unique_ptr<mojo::edk::PlatformChannelPair> platform_channel_;
   service_manager::mojom::PIDReceiverPtr pid_receiver_;
   const scoped_refptr<base::TaskRunner> main_task_runner_;
 
   base::WeakPtrFactory<MojoTestState> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoTestState);
 };
 
 // The name in the manifest results in getting exe:mash_browser_tests used,
@@ skipping 116 matching lines @@
   return base::MakeUnique<MojoTestState>(
       this, command_line, test_launch_options,
       config_ == MojoTestConnector::Config::MASH ? switches::kMash
                                                  : switches::kMus);
 }
 
 void MojoTestConnector::StartService(const std::string& service_name) {
   background_service_manager_->StartService(service_manager::Identity(
       service_name, service_manager::mojom::kRootUserID));
 }