Index: ipc/ipc_channel_unittest.cc |
diff --git a/ipc/ipc_channel_unittest.cc b/ipc/ipc_channel_unittest.cc |
index 0a49ca9abe0146198a5725d2943ee6a1693c0721..134bec26edcbbca3fadb9f7da33c8e597a4e5d91 100644 |
--- a/ipc/ipc_channel_unittest.cc |
+++ b/ipc/ipc_channel_unittest.cc |
@@ -24,12 +24,7 @@ namespace { |
class IPCChannelTest : public IPCTestBase { |
}; |
-#if defined(OS_ANDROID) |
-#define MAYBE_ChannelTest DISABLED_ChannelTest |
-#else |
-#define MAYBE_ChannelTest ChannelTest |
-#endif |
-TEST_F(IPCChannelTest, MAYBE_ChannelTest) { |
+TEST_F(IPCChannelTest, ChannelTest) { |
Init("GenericClient"); |
// Set up IPC channel and start client. |
@@ -91,12 +86,7 @@ TEST_F(IPCChannelTest, ChannelTestExistingPipe) { |
} |
#endif // defined (OS_WIN) |
-#if defined(OS_ANDROID) |
-#define MAYBE_ChannelProxyTest DISABLED_ChannelProxyTest |
-#else |
-#define MAYBE_ChannelProxyTest ChannelProxyTest |
-#endif |
-TEST_F(IPCChannelTest, MAYBE_ChannelProxyTest) { |
+TEST_F(IPCChannelTest, ChannelProxyTest) { |
Init("GenericClient"); |
base::Thread thread("ChannelProxyTestServer"); |
@@ -133,7 +123,7 @@ class ChannelListenerWithOnConnectedSend : public IPC::TestChannelListener { |
} |
}; |
-#if defined(OS_WIN) || defined(OS_ANDROID) |
+#if defined(OS_WIN) |
// Acting flakey in Windows. http://crbug.com/129595 |
#define MAYBE_SendMessageInChannelConnected DISABLED_SendMessageInChannelConnected |
#else |