Make PlatformChannelPair "dumb".

shell/child_main.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 <unistd.h>
 
 #include <memory>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/callback_helpers.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/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/posix/global_descriptors.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/edk/base_edk/platform_handle_watcher_impl.h"
 #include "mojo/edk/base_edk/platform_task_runner_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/multiprocess_embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/embedder/slave_process_delegate.h"
+#include "mojo/edk/platform/platform_handle.h"
 #include "mojo/edk/platform/platform_handle_watcher.h"
 #include "mojo/edk/platform/scoped_platform_handle.h"
 #include "mojo/edk/platform/task_runner.h"
 #include "mojo/edk/util/make_unique.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/core.h"
 #include "shell/child_controller.mojom.h"
 #include "shell/child_switches.h"
 #include "shell/init.h"
 #include "shell/native_application_support.h"
 
+using mojo::platform::PlatformHandle;
 using mojo::platform::PlatformHandleWatcher;
 using mojo::platform::ScopedPlatformHandle;
 using mojo::platform::TaskRunner;
 using mojo::util::MakeRefCounted;
 using mojo::util::MakeUnique;
 using mojo::util::RefPtr;
 
 namespace shell {
 namespace {
 
@@ skipping 253 matching lines @@
 
   shell::InitializeLogging();
 
   // Make sure that we're really meant to be invoked as the child process.
 
   CHECK(command_line.HasSwitch(switches::kChildConnectionId));
   std::string child_connection_id =
       command_line.GetSwitchValueASCII(switches::kChildConnectionId);
   CHECK(!child_connection_id.empty());
 
-  std::string platform_channel_info =
-      command_line.GetSwitchValueASCII(switches::kPlatformChannelHandleInfo);
-  ScopedPlatformHandle platform_handle =
-      mojo::embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
-          platform_channel_info);
-  CHECK(platform_handle.is_valid());
-
+  ScopedPlatformHandle platform_handle(
+      (PlatformHandle(base::GlobalDescriptors::kBaseDescriptor)));
   shell::AppContext app_context;
   app_context.Init(platform_handle.Pass());
 
   shell::Blocker blocker;
   // TODO(vtl): With C++14 lambda captures, this can be made nicer.
   const shell::Blocker::Unblocker unblocker = blocker.GetUnblocker();
   app_context.controller_runner()->PostTask(
       [&app_context, &child_connection_id, &unblocker]() {
         shell::ChildControllerImpl::Init(&app_context, child_connection_id,
                                          unblocker);
       });
   // This will block, then run whatever the controller wants.
   blocker.Block();
 
   app_context.Shutdown();
 
   return 0;
 }