Revert of Mojo EDK: Speculatively disable peer connection tests on Android

mojo/edk/embedder/embedder_unittest.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 <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 561 matching lines @@
 #else
   return NamedPlatformHandle(GenerateRandomToken());
 #endif
 }
 
 void CreateClientHandleOnIoThread(const NamedPlatformHandle& named_handle,
                                   ScopedPlatformHandle* output) {
   *output = CreateClientHandle(named_handle);
 }
 
-#if defined(OS_ANDROID)
-// Disabled on Android as suspected source of flake. https://crbug.com/666356.
-#define MAYBE_ClosePendingPeerConnection DISABLED_ClosePendingPeerConnection
-#else
-#define MAYBE_ClosePendingPeerConnection ClosePendingPeerConnection
-#endif
-TEST_F(EmbedderTest, MAYBE_ClosePendingPeerConnection) {
+TEST_F(EmbedderTest, ClosePendingPeerConnection) {
   NamedPlatformHandle named_handle = GenerateChannelName();
   std::string peer_token = GenerateRandomToken();
   ScopedMessagePipeHandle server_pipe =
       ConnectToPeerProcess(CreateServerHandle(named_handle), peer_token);
   ClosePeerConnection(peer_token);
   EXPECT_EQ(MOJO_RESULT_OK,
             Wait(server_pipe.get(), MOJO_HANDLE_SIGNAL_PEER_CLOSED,
                  MOJO_DEADLINE_INDEFINITE, nullptr));
   base::MessageLoop message_loop;
   base::RunLoop run_loop;
   ScopedPlatformHandle client_handle;
   // Closing the channel involves posting a task to the IO thread to do the
   // work. By the time the local message pipe has been observerd as closed,
   // that task will have been posted. Therefore, a task to create the client
   // connection should be handled after the channel is closed.
   test::GetIoTaskRunner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&CreateClientHandleOnIoThread, named_handle, &client_handle),
       run_loop.QuitClosure());
   run_loop.Run();
   EXPECT_FALSE(client_handle.is_valid());
 }
 
 #if !defined(OS_IOS)
 
-#if defined(OS_ANDROID)
-// Disabled on Android as suspected source of flake. https://crbug.com/666356.
-#define MAYBE_ClosePipeToConnectedPeer DISABLED_ClosePipeToConnectedPeer
-#else
-#define MAYBE_ClosePipeToConnectedPeer ClosePipeToConnectedPeer
-#endif
-TEST_F(EmbedderTest, MAYBE_ClosePipeToConnectedPeer) {
+TEST_F(EmbedderTest, ClosePipeToConnectedPeer) {
   set_launch_type(LaunchType::PEER);
   auto& controller = StartClient("ClosePipeToConnectedPeerClient");
   MojoHandle server_mp = controller.pipe();
   // 1. Write a message to |server_mp| (attaching nothing).
   WriteMessage(server_mp, "hello");
 
   // 2. Read a message from |server_mp|.
   EXPECT_EQ("world!", ReadMessage(server_mp));
 
   controller.ClosePeerConnection();
@@ skipping 10 matching lines @@
   EXPECT_EQ("hello", ReadMessage(client_mp));
 
   // 2. Write a message to |client_mp| (attaching nothing).
   WriteMessage(client_mp, "world!");
 
   ASSERT_EQ(MOJO_RESULT_OK,
             MojoWait(client_mp, MOJO_HANDLE_SIGNAL_PEER_CLOSED,
                       MOJO_DEADLINE_INDEFINITE, nullptr));
 }
 
-#if defined(OS_ANDROID)
-// Disabled on Android as suspected source of flake. https://crbug.com/666356.
-#define MAYBE_ClosePipeToConnectingPeer DISABLED_ClosePipeToConnectingPeer
-#else
-#define MAYBE_ClosePipeToConnectingPeer ClosePipeToConnectingPeer
-#endif
-TEST_F(EmbedderTest, MAYBE_ClosePipeToConnectingPeer) {
+TEST_F(EmbedderTest, ClosePipeToConnectingPeer) {
   set_launch_type(LaunchType::PEER);
   auto& controller = StartClient("ClosePipeToConnectingPeerClient");
   controller.ClosePeerConnection();
 
   MojoHandle server_mp = controller.pipe();
 
   EXPECT_EQ(MOJO_RESULT_OK, MojoWait(server_mp, MOJO_HANDLE_SIGNAL_PEER_CLOSED,
                                      MOJO_DEADLINE_INDEFINITE, nullptr));
 
   EXPECT_EQ(0, controller.WaitForShutdown());
 }
 
 DEFINE_TEST_CLIENT_TEST_WITH_PIPE(ClosePipeToConnectingPeerClient, EmbedderTest,
                                   client_mp) {
   ASSERT_EQ(MOJO_RESULT_OK, MojoWait(client_mp, MOJO_HANDLE_SIGNAL_PEER_CLOSED,
                                      MOJO_DEADLINE_INDEFINITE, nullptr));
 }
 
 #endif  // !defined(OS_IOS)
 
 }  // namespace
 }  // namespace edk
 }  // namespace mojo