| Index: ipc/sync_socket_unittest.cc
|
| diff --git a/ipc/sync_socket_unittest.cc b/ipc/sync_socket_unittest.cc
|
| index 7c83b24797471128bc568811bd5fc19d6e793cae..3385646bd70dd54731fa169642cf2eac05cf6dd3 100644
|
| --- a/ipc/sync_socket_unittest.cc
|
| +++ b/ipc/sync_socket_unittest.cc
|
| @@ -167,12 +167,7 @@ class SyncSocketClientListener : public IPC::Listener {
|
| class SyncSocketTest : public IPCTestBase {
|
| };
|
|
|
| -#if defined(OS_ANDROID)
|
| -#define MAYBE_SanityTest DISABLED_SanityTest
|
| -#else
|
| -#define MAYBE_SanityTest SanityTest
|
| -#endif
|
| -TEST_F(SyncSocketTest, MAYBE_SanityTest) {
|
| +TEST_F(SyncSocketTest, SanityTest) {
|
| Init("SyncSocketServerClient");
|
|
|
| SyncSocketClientListener listener;
|
| @@ -254,13 +249,8 @@ TEST_F(SyncSocketTest, DisconnectTest) {
|
| EXPECT_EQ(0U, received);
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| -#define MAYBE_BlockingReceiveTest DISABLED_BlockingReceiveTest
|
| -#else
|
| -#define MAYBE_BlockingReceiveTest BlockingReceiveTest
|
| -#endif
|
| // Tests that read is a blocking operation.
|
| -TEST_F(SyncSocketTest, MAYBE_BlockingReceiveTest) {
|
| +TEST_F(SyncSocketTest, BlockingReceiveTest) {
|
| base::CancelableSyncSocket pair[2];
|
| ASSERT_TRUE(base::CancelableSyncSocket::CreatePair(&pair[0], &pair[1]));
|
|
|
|
|