Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: ipc/ipc_channel_unittest.cc

Issue 1613523002: Remove ipc_channel_unittests from Android build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove MAYBE_ prefix Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ipc/ipc.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698