Implement a new child test helper for Android.

mojo/edk/system/shared_buffer_unittest.cc

 // Copyright 2015 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 <string.h>
 
 #include <string>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 45 matching lines @@
 // Reads a single message with a shared buffer handle, maps the buffer, copies
 // the message contents into it, then exits.
 DEFINE_TEST_CLIENT_TEST_WITH_PIPE(CopyToBufferClient, SharedBufferTest, h) {
   MojoHandle b;
   std::string message = ReadMessageWithHandles(h, &b, 1);
   WriteToBuffer(b, 0, message);
 
   EXPECT_EQ("quit", ReadMessage(h));
 }
 
-#if defined(OS_ANDROID)
-// Android multi-process tests are not executing the new process. This is flaky.
-#define MAYBE_PassSharedBufferCrossProcess DISABLED_PassSharedBufferCrossProcess
-#else
-#define MAYBE_PassSharedBufferCrossProcess PassSharedBufferCrossProcess
-#endif
-TEST_F(SharedBufferTest, MAYBE_PassSharedBufferCrossProcess) {
+TEST_F(SharedBufferTest, PassSharedBufferCrossProcess) {
   const std::string message = "hello";
   MojoHandle b = CreateBuffer(message.size());
 
   RUN_CHILD_ON_PIPE(CopyToBufferClient, h)
     MojoHandle dupe = DuplicateBuffer(b, false);
     WriteMessageWithHandles(h, message, &dupe, 1);
     WriteMessage(h, "quit");
   END_CHILD()
 
   ExpectBufferContents(b, 0, message);
 }
 
 // Creates a new buffer, maps it, writes a message contents to it, unmaps it,
 // and finally passes it back to the parent.
 DEFINE_TEST_CLIENT_TEST_WITH_PIPE(CreateBufferClient, SharedBufferTest, h) {
   std::string message = ReadMessage(h);
   MojoHandle b = CreateBuffer(message.size());
   WriteToBuffer(b, 0, message);
   WriteMessageWithHandles(h, "have a buffer", &b, 1);
 
   EXPECT_EQ("quit", ReadMessage(h));
 }
 
-#if defined(OS_ANDROID)
-// Android multi-process tests are not executing the new process. This is flaky.
-#define MAYBE_PassSharedBufferFromChild DISABLED_PassSharedBufferFromChild
-#else
-#define MAYBE_PassSharedBufferFromChild PassSharedBufferFromChild
-#endif
-TEST_F(SharedBufferTest, MAYBE_PassSharedBufferFromChild) {
+TEST_F(SharedBufferTest, PassSharedBufferFromChild) {
   const std::string message = "hello";
   MojoHandle b;
   RUN_CHILD_ON_PIPE(CreateBufferClient, h)
     WriteMessage(h, message);
     ReadMessageWithHandles(h, &b, 1);
     WriteMessage(h, "quit");
   END_CHILD()
 
   ExpectBufferContents(b, 0, message);
 }
@@ skipping 24 matching lines @@
   // Receive a shared buffer from the other child.
   MojoHandle b;
   ReadMessageWithHandles(other_child, &b, 1);
 
   // Write the message from the parent into the buffer and exit.
   WriteToBuffer(b, 0, message);
   EXPECT_EQ(MOJO_RESULT_OK, MojoClose(b));
   EXPECT_EQ("quit", ReadMessage(h));
 }
 
-#if defined(OS_ANDROID)
-// Android multi-process tests are not executing the new process. This is flaky.
-#define MAYBE_PassSharedBufferFromChildToChild \
-    DISABLED_PassSharedBufferFromChildToChild
-#else
-#define MAYBE_PassSharedBufferFromChildToChild PassSharedBufferFromChildToChild
-#endif
-TEST_F(SharedBufferTest, MAYBE_PassSharedBufferFromChildToChild) {
+TEST_F(SharedBufferTest, PassSharedBufferFromChildToChild) {
   const std::string message = "hello";
   MojoHandle p0, p1;
   CreateMessagePipe(&p0, &p1);
 
   MojoHandle b;
   RUN_CHILD_ON_PIPE(CreateAndPassBuffer, h0)
     RUN_CHILD_ON_PIPE(ReceiveAndEditBuffer, h1)
       // Send one end of the pipe to each child. The first child will create
       // and pass a buffer to the second child and back to us. The second child
       // will write our message into the buffer.
@@ skipping 163 matching lines @@
     WriteMessage(h, "quit");
     EXPECT_EQ("ok", ReadMessage(h));
   END_CHILD()
 }
 
 #endif  // !defined(OS_IOS)
 
 }  // namespace
 }  // namespace edk
 }  // namespace mojo