Make PlatformChannelPair "dumb".

shell/child_process_host.cc

 // Copyright 2014 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 "shell/child_process_host.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/posix/global_descriptors.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "mojo/edk/base_edk/platform_task_runner_impl.h"
 #include "mojo/edk/embedder/multiprocess_embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/util/ref_ptr.h"
@@ skipping 36 matching lines @@
     launch_data->child_path =
         context_->mojo_shell_child_path().InsertBeforeExtensionASCII("_32");
   }
 #endif
   // TODO(vtl): Add something for |slave_info|.
   // TODO(vtl): The "unretained this" is wrong (see also below).
   // TODO(vtl): We shouldn't have to make a new
   // |base_edk::PlatformTaskRunnerImpl| for each instance. Instead, there should
   // be one per thread.
   mojo::ScopedMessagePipeHandle handle(mojo::embedder::ConnectToSlave(
-      nullptr, launch_data->platform_channel_pair.PassServerHandle(),
+      nullptr, launch_data->platform_channel_pair.handle0.Pass(),
       [this]() { DidConnectToSlave(); },
       MakeRefCounted<base_edk::PlatformTaskRunnerImpl>(
           base::ThreadTaskRunnerHandle::Get()),
       &launch_data->child_connection_id, &channel_info_));
   // TODO(vtl): We should destroy the channel on destruction (using
   // |channel_info_|, but only after the callback has been called.
   CHECK(channel_info_);
 
   controller_.Bind(mojo::InterfacePtrInfo<ChildController>(handle.Pass(), 0u));
   controller_.set_connection_error_handler([this]() { OnConnectionError(); });
@@ skipping 55 matching lines @@
       switches::kTraceToConsole, switches::kV, switches::kVModule,
   };
 
   base::CommandLine child_command_line(launch_data->child_path);
   child_command_line.CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
                                       kForwardSwitches,
                                       arraysize(kForwardSwitches));
   child_command_line.AppendSwitchASCII(switches::kChildConnectionId,
                                        launch_data->child_connection_id);
 
-  mojo::embedder::HandlePassingInformation handle_passing_info;
-  std::string platform_channel_info;
-  launch_data->platform_channel_pair.PrepareToPassClientHandleToChildProcess(
-      &platform_channel_info, &handle_passing_info);
-  child_command_line.AppendSwitchASCII(switches::kPlatformChannelHandleInfo,
-                                       platform_channel_info);
-
+  base::FileHandleMappingVector fds_to_remap;
+  fds_to_remap.push_back(
+      std::pair<int, int>(launch_data->platform_channel_pair.handle1.get().fd,
+                          base::GlobalDescriptors::kBaseDescriptor));
   base::LaunchOptions options;
-  options.fds_to_remap = &handle_passing_info;
+  options.fds_to_remap = &fds_to_remap;
 #if defined(OS_LINUX)
   options.allow_new_privs = launch_data->options.allow_new_privs;
 #endif
   DVLOG(2) << "Launching child with command line: "
            << child_command_line.GetCommandLineString();
   base::Process child_process =
       base::LaunchProcess(child_command_line, options);
   if (child_process.IsValid())
-    launch_data->platform_channel_pair.ChildProcessLaunched();
+    launch_data->platform_channel_pair.handle1.reset();
   return child_process.Pass();
 }
 
 void ChildProcessHost::AppCompleted(int32_t result) {
   if (!on_app_complete_.is_null()) {
     auto on_app_complete = on_app_complete_;
     on_app_complete_.reset();
     on_app_complete.Run(result);
   }
 }
 
 void ChildProcessHost::OnConnectionError() {
   AppCompleted(MOJO_RESULT_UNKNOWN);
 }
 
 }  // namespace shell