| Index: mojo/edk/embedder/embedder_unittest.cc
|
| diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/edk/embedder/embedder_unittest.cc
|
| index 5d38b6e96897139f3aeecc68efa445ac01b7cc8e..623177c119744ec01a4e69983ca0b4ab2d02791f 100644
|
| --- a/mojo/edk/embedder/embedder_unittest.cc
|
| +++ b/mojo/edk/embedder/embedder_unittest.cc
|
| @@ -199,13 +199,7 @@ TEST_F(EmbedderTest, ChannelsHandlePassing) {
|
|
|
| #if !defined(OS_IOS)
|
|
|
| -#if defined(OS_ANDROID)
|
| -// Android multi-process tests are not executing the new process. This is flaky.
|
| -#define MAYBE_MultiprocessChannels DISABLED_MultiprocessChannels
|
| -#else
|
| -#define MAYBE_MultiprocessChannels MultiprocessChannels
|
| -#endif // defined(OS_ANDROID)
|
| -TEST_F(EmbedderTest, MAYBE_MultiprocessChannels) {
|
| +TEST_F(EmbedderTest, MultiprocessChannels) {
|
| RUN_CHILD_ON_PIPE(MultiprocessChannelsClient, server_mp)
|
| // 1. Write a message to |server_mp| (attaching nothing).
|
| WriteMessage(server_mp, "hello");
|
| @@ -291,13 +285,7 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(MultiprocessChannelsClient, EmbedderTest,
|
| ASSERT_EQ(MOJO_RESULT_OK, MojoClose(mp1));
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| -// Android multi-process tests are not executing the new process. This is flaky.
|
| -#define MAYBE_MultiprocessBaseSharedMemory DISABLED_MultiprocessBaseSharedMemory
|
| -#else
|
| -#define MAYBE_MultiprocessBaseSharedMemory MultiprocessBaseSharedMemory
|
| -#endif // defined(OS_ANDROID)
|
| -TEST_F(EmbedderTest, MAYBE_MultiprocessBaseSharedMemory) {
|
| +TEST_F(EmbedderTest, MultiprocessBaseSharedMemory) {
|
| RUN_CHILD_ON_PIPE(MultiprocessSharedMemoryClient, server_mp)
|
| // 1. Create a base::SharedMemory object and create a mojo shared buffer
|
| // from it.
|
|
|