Add multiplexing of message pipes in the new EDK.

mojo/edk/embedder/embedder.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 "mojo/edk/embedder/embedder.h"
 
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 79 matching lines @@
 
 void PreInitializeParentProcess() {
   BrokerState::GetInstance();
 }
 
 void PreInitializeChildProcess() {
   ChildBroker::GetInstance();
 }
 
 ScopedPlatformHandle ChildProcessLaunched(base::ProcessHandle child_process) {
-#if defined(OS_WIN)
   PlatformChannelPair token_channel;
   new ChildBrokerHost(child_process, token_channel.PassServerHandle());
   return token_channel.PassClientHandle();
-#else
-  // TODO(jam): create this for POSIX. Need to implement channel reading first
-  // so we don't leak handles.
-  return ScopedPlatformHandle();
-#endif
 }
 
 void ChildProcessLaunched(base::ProcessHandle child_process,
                           ScopedPlatformHandle server_pipe) {
   new ChildBrokerHost(child_process, server_pipe.Pass());
 }
 
 void SetParentPipeHandle(ScopedPlatformHandle pipe) {
   ChildBroker::GetInstance()->SetChildBrokerHostHandle(pipe.Pass());
 }
@@ skipping 75 matching lines @@
 }
 
 void ShutdownIPCSupportAndWaitForNoChannels() {
   g_delegate_task_runner = base::MessageLoop::current()->task_runner().get();
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE, base::Bind(&ShutdownIPCSupportHelper, true));
 }
 
 ScopedMessagePipeHandle CreateMessagePipe(
     ScopedPlatformHandle platform_handle) {
+  MojoCreateMessagePipeOptions options = {
+      static_cast<uint32_t>(sizeof(MojoCreateMessagePipeOptions)),
+      MOJO_CREATE_MESSAGE_PIPE_OPTIONS_FLAG_TRANSFERABLE};
   scoped_refptr<MessagePipeDispatcher> dispatcher =
-      MessagePipeDispatcher::Create(
-          MessagePipeDispatcher::kDefaultCreateOptions);
+      MessagePipeDispatcher::Create(options);
 
   ScopedMessagePipeHandle rv(
       MessagePipeHandle(internal::g_core->AddDispatcher(dispatcher)));
   CHECK(rv.is_valid());
   dispatcher->Init(platform_handle.Pass(), nullptr, 0, nullptr, 0, nullptr,
                    nullptr);
   // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it
   // once that's fixed.
   return rv.Pass();
 }
 
 }  // namespace edk
 }  // namespace mojo