Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.

mojo/edk/embedder/embedder_unittest.cc

Index: mojo/edk/embedder/embedder_unittest.cc
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc b/mojo/edk/embedder/embedder_unittest.cc
similarity index 50%
copy from third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
copy to mojo/edk/embedder/embedder_unittest.cc
index 04634ac8e891cda574834142fc4c3aff8d92b86a..4507328cb76214bc55b17b6db64e566280f75e06 100644
--- a/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
+++ b/mojo/edk/embedder/embedder_unittest.cc
@@ -2,32 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-
-#include <string.h>
+#include "mojo/edk/embedder/embedder.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/test/test_io_thread.h"
 #include "base/test/test_timeouts.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/edk/embedder/simple_platform_support.h"
+#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/edk/system/test_utils.h"
+#include "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/c/system/core.h"
 #include "mojo/public/cpp/system/handle.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
-#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h"
-#include "third_party/mojo/src/mojo/edk/system/mutex.h"
-#include "third_party/mojo/src/mojo/edk/system/test_utils.h"
-#include "third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h"
-#include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h"
 
 namespace mojo {
-namespace embedder {
+namespace edk {
 namespace {
 
 const MojoHandleSignals kSignalReadadableWritable =
@@ -37,131 +34,29 @@ const MojoHandleSignals kSignalAll = MOJO_HANDLE_SIGNAL_READABLE |
                                      MOJO_HANDLE_SIGNAL_WRITABLE |
                                      MOJO_HANDLE_SIGNAL_PEER_CLOSED;
 
-const char kConnectionIdFlag[] = "test-connection-id";
-
-void DoNothing() {}
-
-class ScopedTestChannel {
+class EmbedderTest : public test::MojoSystemTest {
  public:
-  // Creates a channel, which lives on the I/O thread given to
-  // |InitIPCSupport()|. After construction, |bootstrap_message_pipe()| gives
-  // the Mojo handle for the bootstrap message pipe on this channel; it is up to
-  // the caller to close this handle. Note: The I/O thread must outlive this
-  // object (and its message loop must continue pumping messages while this
-  // object is alive).
-  explicit ScopedTestChannel(ScopedPlatformHandle platform_handle)
-      : bootstrap_message_pipe_(MOJO_HANDLE_INVALID),
-        event_(true, false),  // Manual reset.
-        channel_info_(nullptr),
-        wait_on_shutdown_(true) {
-    bootstrap_message_pipe_ =
-        CreateChannel(platform_handle.Pass(),
-                      base::Bind(&ScopedTestChannel::DidCreateChannel,
-                                 base::Unretained(this)),
-                      nullptr)
-            .release()
-            .value();
-    CHECK_NE(bootstrap_message_pipe_, MOJO_HANDLE_INVALID);
-  }
-
-  // Destructor: Shuts down the channel. (As noted above, for this to happen,
-  // the I/O thread must be alive and pumping messages.)
-  ~ScopedTestChannel() {
-    // |WaitForChannelCreationCompletion()| must be called before destruction.
-    CHECK(event_.IsSignaled());
-    event_.Reset();
-    if (wait_on_shutdown_) {
-      DestroyChannel(channel_info_,
-                     base::Bind(&ScopedTestChannel::DidDestroyChannel,
-                                base::Unretained(this)),
-                     nullptr);
-      event_.Wait();
-    } else {
-      DestroyChannel(channel_info_, base::Bind(&DoNothing), nullptr);
-    }
-  }
-
-  // Waits for channel creation to be completed.
-  void WaitForChannelCreationCompletion() { event_.Wait(); }
-
-  MojoHandle bootstrap_message_pipe() const { return bootstrap_message_pipe_; }
-
-  // Call only after |WaitForChannelCreationCompletion()|. Use only to check
-  // that it's not null.
-  const ChannelInfo* channel_info() const { return channel_info_; }
-
-  // Don't wait for the channel shutdown to finish on destruction. Used to
-  // exercise races.
-  void NoWaitOnShutdown() { wait_on_shutdown_ = false; }
-
- private:
-  void DidCreateChannel(ChannelInfo* channel_info) {
-    CHECK(channel_info);
-    CHECK(!channel_info_);
-    channel_info_ = channel_info;
-    event_.Signal();
-  }
-
-  void DidDestroyChannel() { event_.Signal(); }
-
-  // Valid from creation until whenever it gets closed (by the "owner" of this
-  // object).
-  // Note: We don't want use the C++ wrappers here, since we want to test the
-  // API at the lowest level.
-  MojoHandle bootstrap_message_pipe_;
-
-  // Set after channel creation has been completed (i.e., the callback to
-  // |CreateChannel()| has been called). Also used in the destructor to wait for
-  // |DestroyChannel()| completion.
-  base::WaitableEvent event_;
-
-  // Valid after channel creation completion until destruction.
-  ChannelInfo* channel_info_;
-
-  // Whether the destructor should wait until the channel is destroyed.
-  bool wait_on_shutdown_;
-
-  MOJO_DISALLOW_COPY_AND_ASSIGN(ScopedTestChannel);
-};
-
-class EmbedderTest : public testing::Test {
- public:
-  EmbedderTest() : test_io_thread_(base::TestIOThread::kAutoStart) {}
+  EmbedderTest() {}
   ~EmbedderTest() override {}
 
- protected:
-  base::TestIOThread& test_io_thread() { return test_io_thread_; }
-  scoped_refptr<base::TaskRunner> test_io_task_runner() {
-    return test_io_thread_.task_runner();
-  }
-
  private:
-  void SetUp() override { test::InitWithSimplePlatformSupport(); }
-
-  void TearDown() override { EXPECT_TRUE(test::Shutdown()); }
-
-  base::TestIOThread test_io_thread_;
-
   MOJO_DISALLOW_COPY_AND_ASSIGN(EmbedderTest);
 };
 
-TEST_F(EmbedderTest, ChannelsBasic) {
-  mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner());
-
-  PlatformChannelPair channel_pair;
-  ScopedTestChannel server_channel(channel_pair.PassServerHandle());
-  MojoHandle server_mp = server_channel.bootstrap_message_pipe();
-  EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
-  ScopedTestChannel client_channel(channel_pair.PassClientHandle());
-  MojoHandle client_mp = client_channel.bootstrap_message_pipe();
-  EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
+TEST_F(EmbedderTest, ChannelBasic) {
+  MojoHandle server_mp, client_mp;
+  ASSERT_EQ(MOJO_RESULT_OK,
+            MojoCreateMessagePipe(nullptr, &server_mp, &client_mp));
 
   // We can write to a message pipe handle immediately.
   const char kHello[] = "hello";
-  EXPECT_EQ(
-      MOJO_RESULT_OK,
-      MojoWriteMessage(server_mp, kHello, static_cast<uint32_t>(sizeof(kHello)),
-                       nullptr, 0, MOJO_WRITE_MESSAGE_FLAG_NONE));
+
+  size_t write_size = sizeof(kHello);
+  const char* write_buffer = kHello;
+  EXPECT_EQ(MOJO_RESULT_OK,
+            MojoWriteMessage(server_mp, write_buffer,
+                             static_cast<uint32_t>(write_size), nullptr, 0,
+                             MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Now wait for the other side to become readable.
   MojoHandleSignalsState state;
@@ -170,116 +65,144 @@ TEST_F(EmbedderTest, ChannelsBasic) {
   EXPECT_EQ(kSignalReadadableWritable, state.satisfied_signals);
   EXPECT_EQ(kSignalAll, state.satisfiable_signals);
 
-  char buffer[1000] = {};
-  uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer));
+  char read_buffer[1000] = {};
+  uint32_t num_bytes = static_cast<uint32_t>(sizeof(read_buffer));
   EXPECT_EQ(MOJO_RESULT_OK,
-            MojoReadMessage(client_mp, buffer, &num_bytes, nullptr, nullptr,
-                            MOJO_READ_MESSAGE_FLAG_NONE));
-  EXPECT_EQ(sizeof(kHello), num_bytes);
-  EXPECT_STREQ(kHello, buffer);
+            MojoReadMessage(client_mp, read_buffer, &num_bytes, nullptr,
+                            nullptr, MOJO_READ_MESSAGE_FLAG_NONE));
+  EXPECT_EQ(write_size, num_bytes);
+  EXPECT_STREQ(kHello, read_buffer);
 
   EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp));
   EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp));
-
-  // By this point, these waits should basically be no-ops (since we've waited
-  // for the client message pipe to become readable, which implies that both
-  // the server and client channels were completely created).
-  server_channel.WaitForChannelCreationCompletion();
-  client_channel.WaitForChannelCreationCompletion();
-  EXPECT_TRUE(server_channel.channel_info());
-  EXPECT_TRUE(client_channel.channel_info());
 }
 
-class TestAsyncWaiter {
- public:
-  TestAsyncWaiter() : event_(true, false), wait_result_(MOJO_RESULT_UNKNOWN) {}
+// Test sending a MP which has read messages out of the OS pipe but which have
+// not been consumed using MojoReadMessage yet.
+TEST_F(EmbedderTest, SendReadableMessagePipe) {
+  MojoHandle server_mp, client_mp;
+  ASSERT_EQ(MOJO_RESULT_OK,
+            MojoCreateMessagePipe(nullptr, &server_mp, &client_mp));
+
+  MojoHandle server_mp2, client_mp2;
+  ASSERT_EQ(MOJO_RESULT_OK,
+            MojoCreateMessagePipe(nullptr, &server_mp2, &client_mp2));
+
+  // Write to server2 and wait for client2 to be readable before sending it.
+  // client2's MessagePipeDispatcher will have the message below in its
+  // message_queue_. For extra measures, also verify that this pending message
+  // can contain a message pipe.
+  MojoHandle server_mp3, client_mp3;
+  ASSERT_EQ(MOJO_RESULT_OK,
+            MojoCreateMessagePipe(nullptr, &server_mp3, &client_mp3));
+  const char kHello[] = "hello";
+  size_t write_size;
+  const char* write_buffer;
+  write_buffer = kHello;
+  write_size = sizeof(kHello);
+  EXPECT_EQ(MOJO_RESULT_OK,
+            MojoWriteMessage(server_mp2, write_buffer,
+                             static_cast<uint32_t>(write_size), &client_mp3, 1,
+                             MOJO_WRITE_MESSAGE_FLAG_NONE));
 
-  void Awake(MojoResult result) {
-    system::MutexLocker l(&wait_result_mutex_);
-    wait_result_ = result;
-    event_.Signal();
-  }
+  MojoHandleSignalsState state;
+  EXPECT_EQ(MOJO_RESULT_OK, MojoWait(client_mp2, MOJO_HANDLE_SIGNAL_READABLE,
+                                     MOJO_DEADLINE_INDEFINITE, &state));
+  EXPECT_EQ(kSignalReadadableWritable, state.satisfied_signals);
+  EXPECT_EQ(kSignalAll, state.satisfiable_signals);
 
-  bool TryWait() { return event_.TimedWait(TestTimeouts::action_timeout()); }
+  // Now send client2
+  EXPECT_EQ(MOJO_RESULT_OK,
+            MojoWriteMessage(server_mp, write_buffer,
+                             static_cast<uint32_t>(write_size), &client_mp2, 1,
+                             MOJO_WRITE_MESSAGE_FLAG_NONE));
 
-  MojoResult wait_result() const {
-    system::MutexLocker l(&wait_result_mutex_);
-    return wait_result_;
-  }
 
- private:
-  base::WaitableEvent event_;
+  EXPECT_EQ(MOJO_RESULT_OK, MojoWait(client_mp, MOJO_HANDLE_SIGNAL_READABLE,
+                                     MOJO_DEADLINE_INDEFINITE, &state));
+  EXPECT_EQ(kSignalReadadableWritable, state.satisfied_signals);
+  EXPECT_EQ(kSignalAll, state.satisfiable_signals);
 
-  mutable system::Mutex wait_result_mutex_;
-  MojoResult wait_result_ MOJO_GUARDED_BY(wait_result_mutex_);
+  char read_buffer[20000] = {};
+  uint32_t num_bytes = static_cast<uint32_t>(sizeof(read_buffer));
+  MojoHandle ports[10];
+  uint32_t num_ports;
+  EXPECT_EQ(MOJO_RESULT_OK,
+            MojoReadMessage(client_mp, read_buffer, &num_bytes, &ports[0],
+                            &num_ports, MOJO_READ_MESSAGE_FLAG_NONE));
+  EXPECT_EQ(write_size, num_bytes);
+  EXPECT_STREQ(kHello, read_buffer);
+  EXPECT_EQ(1, num_ports);
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(TestAsyncWaiter);
-};
 
-void WriteHello(MessagePipeHandle pipe) {
-  static const char kHello[] = "hello";
-  CHECK_EQ(MOJO_RESULT_OK,
-           WriteMessageRaw(pipe, kHello, static_cast<uint32_t>(sizeof(kHello)),
-                           nullptr, 0, MOJO_WRITE_MESSAGE_FLAG_NONE));
-}
+  client_mp2 = ports[0];
+  EXPECT_EQ(MOJO_RESULT_OK, MojoWait(client_mp2, MOJO_HANDLE_SIGNAL_READABLE,
+                                     MOJO_DEADLINE_INDEFINITE, &state));
+  EXPECT_EQ(kSignalReadadableWritable, state.satisfied_signals);
+  EXPECT_EQ(kSignalAll, state.satisfiable_signals);
+
+
+  EXPECT_EQ(MOJO_RESULT_OK,
+            MojoReadMessage(client_mp2, read_buffer, &num_bytes, &client_mp3,
+                            &num_ports, MOJO_READ_MESSAGE_FLAG_NONE));
+  EXPECT_EQ(write_size, num_bytes);
+  EXPECT_STREQ(kHello, read_buffer);
+  EXPECT_EQ(1, num_ports);
 
-void CloseScopedHandle(ScopedMessagePipeHandle handle) {
-  // Do nothing and the destructor will close it.
+
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp3));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp3));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp2));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp2));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp));
 }
 
-TEST_F(EmbedderTest, AsyncWait) {
-  ScopedMessagePipeHandle client_mp;
-  ScopedMessagePipeHandle server_mp;
-  EXPECT_EQ(MOJO_RESULT_OK, CreateMessagePipe(nullptr, &client_mp, &server_mp));
+// TODO(jam): fix and renable
+TEST_F(EmbedderTest, DISABLED_SendMessagePipeWithWriteQueue) {
+  MojoHandle server_mp, client_mp;
+  ASSERT_EQ(MOJO_RESULT_OK,
+            MojoCreateMessagePipe(nullptr, &server_mp, &client_mp));
+
+  MojoHandle server_mp2, client_mp2;
+  ASSERT_EQ(MOJO_RESULT_OK,
+            MojoCreateMessagePipe(nullptr, &server_mp2, &client_mp2));
+
+  static const size_t kNumMessages = 1001;
+  for (size_t i = 0; i < kNumMessages; i++) {
+    std::string write_buffer(i, 'A' + (i % 26));
+    ASSERT_EQ(MOJO_RESULT_OK,
+            MojoWriteMessage(client_mp2, write_buffer.data(),
+                             write_buffer.size(), nullptr, 0,
+                             MOJO_WRITE_MESSAGE_FLAG_NONE));
+  }
 
-  TestAsyncWaiter waiter;
+  // Now send client2
   EXPECT_EQ(MOJO_RESULT_OK,
-            AsyncWait(client_mp.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
-                      base::Bind(&TestAsyncWaiter::Awake,
-                                 base::Unretained(&waiter))));
-
-  test_io_task_runner()->PostTask(FROM_HERE,
-                                  base::Bind(&WriteHello, server_mp.get()));
-  EXPECT_TRUE(waiter.TryWait());
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.wait_result());
-
-  // If message is in the queue, it does't allow us to wait.
-  TestAsyncWaiter waiter_that_doesnt_wait;
-  EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
-            AsyncWait(client_mp.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
-                      base::Bind(&TestAsyncWaiter::Awake,
-                                 base::Unretained(&waiter_that_doesnt_wait))));
-
-  char buffer[1000];
-  uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer));
-  CHECK_EQ(MOJO_RESULT_OK,
-           ReadMessageRaw(client_mp.get(), buffer, &num_bytes, nullptr, nullptr,
-                          MOJO_READ_MESSAGE_FLAG_NONE));
+            MojoWriteMessage(server_mp, nullptr, 0, &client_mp2, 1,
+                             MOJO_WRITE_MESSAGE_FLAG_NONE));
 
-  TestAsyncWaiter unsatisfiable_waiter;
-  EXPECT_EQ(MOJO_RESULT_OK,
-            AsyncWait(client_mp.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
-                      base::Bind(&TestAsyncWaiter::Awake,
-                                 base::Unretained(&unsatisfiable_waiter))));
+  MojoHandleSignalsState state;
+  EXPECT_EQ(MOJO_RESULT_OK, MojoWait(client_mp, MOJO_HANDLE_SIGNAL_READABLE,
+                                     MOJO_DEADLINE_INDEFINITE, &state));
+  EXPECT_EQ(kSignalReadadableWritable, state.satisfied_signals);
+  EXPECT_EQ(kSignalAll, state.satisfiable_signals);
+
+  /// todo: read all msgs written..
 
-  test_io_task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&CloseScopedHandle, base::Passed(server_mp.Pass())));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp2));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp2));
 
-  EXPECT_TRUE(unsatisfiable_waiter.TryWait());
-  EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-            unsatisfiable_waiter.wait_result());
+
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp));
+  EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp));
 }
 
 TEST_F(EmbedderTest, ChannelsHandlePassing) {
-  mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner());
-
-  PlatformChannelPair channel_pair;
-  ScopedTestChannel server_channel(channel_pair.PassServerHandle());
-  MojoHandle server_mp = server_channel.bootstrap_message_pipe();
+  MojoHandle server_mp, client_mp;
+  ASSERT_EQ(MOJO_RESULT_OK,
+            MojoCreateMessagePipe(nullptr, &server_mp, &client_mp));
   EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
-  ScopedTestChannel client_channel(channel_pair.PassClientHandle());
-  MojoHandle client_mp = client_channel.bootstrap_message_pipe();
   EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
 
   MojoHandle h0, h1;
@@ -385,168 +308,6 @@ TEST_F(EmbedderTest, ChannelsHandlePassing) {
   EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp));
   EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h0));
   EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h1));
-
-  server_channel.WaitForChannelCreationCompletion();
-  client_channel.WaitForChannelCreationCompletion();
-  EXPECT_TRUE(server_channel.channel_info());
-  EXPECT_TRUE(client_channel.channel_info());
-}
-
-#if defined(OS_ANDROID)
-// Android multi-process tests are not executing the new process. This is flaky.
-// TODO(vtl): I'm guessing this is true of this test too?
-#define MAYBE_MultiprocessMasterSlave DISABLED_MultiprocessMasterSlave
-#else
-#define MAYBE_MultiprocessMasterSlave MultiprocessMasterSlave
-#endif  // defined(OS_ANDROID)
-TEST_F(EmbedderTest, MAYBE_MultiprocessMasterSlave) {
-  mojo::test::ScopedMasterIPCSupport ipc_support(test_io_task_runner());
-
-  mojo::test::MultiprocessTestHelper multiprocess_test_helper;
-  std::string connection_id;
-  base::WaitableEvent event(true, false);
-  ChannelInfo* channel_info = nullptr;
-  ScopedMessagePipeHandle mp = ConnectToSlave(
-      nullptr, multiprocess_test_helper.server_platform_handle.Pass(),
-      base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)),
-      nullptr, &connection_id, &channel_info);
-  ASSERT_TRUE(mp.is_valid());
-  EXPECT_TRUE(channel_info);
-  ASSERT_FALSE(connection_id.empty());
-
-  multiprocess_test_helper.StartChildWithExtraSwitch(
-      "MultiprocessMasterSlave", kConnectionIdFlag, connection_id);
-
-  // Send a message saying "hello".
-  EXPECT_EQ(MOJO_RESULT_OK, WriteMessageRaw(mp.get(), "hello", 5, nullptr, 0,
-                                            MOJO_WRITE_MESSAGE_FLAG_NONE));
-
-  // Wait for a response.
-  EXPECT_EQ(MOJO_RESULT_OK,
-            Wait(mp.get(), MOJO_HANDLE_SIGNAL_READABLE,
-                 mojo::system::test::ActionDeadline(), nullptr));
-
-  // The response message should say "world".
-  char buffer[100];
-  uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer));
-  EXPECT_EQ(MOJO_RESULT_OK,
-            ReadMessageRaw(mp.get(), buffer, &num_bytes, nullptr, nullptr,
-                           MOJO_READ_MESSAGE_FLAG_NONE));
-  EXPECT_EQ(5u, num_bytes);
-  EXPECT_EQ(0, memcmp(buffer, "world", 5));
-
-  mp.reset();
-
-  EXPECT_TRUE(multiprocess_test_helper.WaitForChildTestShutdown());
-
-  EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout()));
-  test_io_thread().PostTaskAndWait(
-      FROM_HERE,
-      base::Bind(&DestroyChannelOnIOThread, base::Unretained(channel_info)));
-}
-
-TEST_F(EmbedderTest, ChannelShutdownRace_MessagePipeClose) {
-  const size_t kIterations = 1000;
-  mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner());
-
-  for (size_t i = 0; i < kIterations; i++) {
-    PlatformChannelPair channel_pair;
-    scoped_ptr<ScopedTestChannel> server_channel(
-        new ScopedTestChannel(channel_pair.PassServerHandle()));
-    server_channel->WaitForChannelCreationCompletion();
-    server_channel->NoWaitOnShutdown();
-
-    MojoHandle server_mp = server_channel->bootstrap_message_pipe();
-    EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
-
-    // Race between channel shutdown and closing a message pipe. The message
-    // pipe doesn't have to be the bootstrap pipe. It just has to be bound to
-    // the channel.
-    server_channel.reset();
-    MojoClose(server_mp);
-  }
-}
-
-TEST_F(EmbedderTest, ChannelShutdownRace_MessagePipePassing) {
-  const size_t kIterations = 1000;
-  mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner());
-
-  for (size_t i = 0; i < kIterations; i++) {
-    PlatformChannelPair channel_pair;
-    scoped_ptr<ScopedTestChannel> server_channel(
-        new ScopedTestChannel(channel_pair.PassServerHandle()));
-    server_channel->WaitForChannelCreationCompletion();
-    server_channel->NoWaitOnShutdown();
-
-    MojoHandle server_mp = server_channel->bootstrap_message_pipe();
-    EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
-
-    MessagePipe test_pipe;
-    MojoHandle passing_handle = test_pipe.handle0.release().value();
-
-    // Race between channel shutdown and passing a message pipe.
-    server_channel.reset();
-    MojoWriteMessage(server_mp, nullptr, 0, &passing_handle, 1,
-                     MOJO_WRITE_MESSAGE_FLAG_NONE);
-    MojoClose(server_mp);
-    MojoClose(passing_handle);
-  }
-}
-
-MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessMasterSlave) {
-  ScopedPlatformHandle client_platform_handle =
-      mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
-  EXPECT_TRUE(client_platform_handle.is_valid());
-
-  base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
-  test::InitWithSimplePlatformSupport();
-
-  {
-    mojo::test::ScopedSlaveIPCSupport ipc_support(
-        test_io_thread.task_runner(), client_platform_handle.Pass());
-
-    const base::CommandLine& command_line =
-        *base::CommandLine::ForCurrentProcess();
-    ASSERT_TRUE(command_line.HasSwitch(kConnectionIdFlag));
-    std::string connection_id =
-        command_line.GetSwitchValueASCII(kConnectionIdFlag);
-    ASSERT_FALSE(connection_id.empty());
-    base::WaitableEvent event(true, false);
-    ChannelInfo* channel_info = nullptr;
-    ScopedMessagePipeHandle mp = ConnectToMaster(
-        connection_id,
-        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)),
-        nullptr, &channel_info);
-    ASSERT_TRUE(mp.is_valid());
-    EXPECT_TRUE(channel_info);
-
-    // Wait for the master to send us a message.
-    EXPECT_EQ(MOJO_RESULT_OK,
-              Wait(mp.get(), MOJO_HANDLE_SIGNAL_READABLE,
-                   mojo::system::test::ActionDeadline(), nullptr));
-
-    // It should say "hello".
-    char buffer[100];
-    uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer));
-    EXPECT_EQ(MOJO_RESULT_OK,
-              ReadMessageRaw(mp.get(), buffer, &num_bytes, nullptr, nullptr,
-                             MOJO_READ_MESSAGE_FLAG_NONE));
-    EXPECT_EQ(5u, num_bytes);
-    EXPECT_EQ(0, memcmp(buffer, "hello", 5));
-
-    // In response send a message saying "world".
-    EXPECT_EQ(MOJO_RESULT_OK, WriteMessageRaw(mp.get(), "world", 5, nullptr, 0,
-                                              MOJO_WRITE_MESSAGE_FLAG_NONE));
-
-    mp.reset();
-
-    EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout()));
-    test_io_thread.PostTaskAndWait(
-        FROM_HERE,
-        base::Bind(&DestroyChannelOnIOThread, base::Unretained(channel_info)));
-  }
-
-  EXPECT_TRUE(test::Shutdown());
 }
 
 // The sequence of messages sent is:
@@ -571,20 +332,13 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessMasterSlave) {
 #define MAYBE_MultiprocessChannels MultiprocessChannels
 #endif  // defined(OS_ANDROID)
 TEST_F(EmbedderTest, MAYBE_MultiprocessChannels) {
-  // TODO(vtl): This should eventually initialize a master process instead,
-  // probably.
-  mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner());
-
-  mojo::test::MultiprocessTestHelper multiprocess_test_helper;
+  test::MultiprocessTestHelper multiprocess_test_helper;
   multiprocess_test_helper.StartChild("MultiprocessChannelsClient");
 
   {
-    ScopedTestChannel server_channel(
-        multiprocess_test_helper.server_platform_handle.Pass());
-    MojoHandle server_mp = server_channel.bootstrap_message_pipe();
-    EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
-    server_channel.WaitForChannelCreationCompletion();
-    EXPECT_TRUE(server_channel.channel_info());
+    MojoHandle server_mp = CreateMessagePipe(
+        multiprocess_test_helper.server_platform_handle.Pass()).release().
+            value();
 
     // 1. Write a message to |server_mp| (attaching nothing).
     const char kHello[] = "hello";
@@ -653,7 +407,7 @@ TEST_F(EmbedderTest, MAYBE_MultiprocessChannels) {
     EXPECT_NE(mp2, MOJO_HANDLE_INVALID);
 
     // 7. Read a message from |mp2|.
-    EXPECT_EQ(MOJO_RESULT_OK, MojoWait(mp2, MOJO_HANDLE_SIGNAL_READABLE,
+    EXPECT_EQ(MOJO_RESULT_OK, MojoWait(mp2, MOJO_HANDLE_SIGNAL_PEER_CLOSED,
                                        MOJO_DEADLINE_INDEFINITE, &state));
     EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_PEER_CLOSED,
               state.satisfied_signals);
@@ -690,22 +444,15 @@ TEST_F(EmbedderTest, MAYBE_MultiprocessChannels) {
 
 MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) {
   ScopedPlatformHandle client_platform_handle =
-      mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
+      test::MultiprocessTestHelper::client_platform_handle.Pass();
   EXPECT_TRUE(client_platform_handle.is_valid());
 
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
-  test::InitWithSimplePlatformSupport();
 
   {
-    // TODO(vtl): This should eventually initialize a slave process instead,
-    // probably.
-    mojo::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner());
-
-    ScopedTestChannel client_channel(client_platform_handle.Pass());
-    MojoHandle client_mp = client_channel.bootstrap_message_pipe();
-    EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
-    client_channel.WaitForChannelCreationCompletion();
-    CHECK(client_channel.channel_info() != nullptr);
+    test::ScopedIPCSupport ipc_support(test_io_thread.task_runner());
+    MojoHandle client_mp = CreateMessagePipe(
+        client_platform_handle.Pass()).release().value();
 
     // 1. Read the first message from |client_mp|.
     MojoHandleSignalsState state;
@@ -803,13 +550,11 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) {
     EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, state.satisfiable_signals);
     EXPECT_EQ(MOJO_RESULT_OK, MojoClose(mp1));
   }
-
-  EXPECT_TRUE(test::Shutdown());
 }
 
 // TODO(vtl): Test immediate write & close.
 // TODO(vtl): Test broken-connection cases.
 
 }  // namespace
-}  // namespace embedder
+}  // namespace edk
 }  // namespace mojo