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

Unified Diff: ipc/ipc_channel_proxy_unittest.cc

Issue 1259823002: Remove Android filter file for ipc_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remaining tests Created 5 years, 5 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_channel_posix_unittest.cc ('k') | ipc/ipc_channel_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_channel_proxy_unittest.cc
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc
index ee5dc22626cd2f8f0902ebd0c58624dca4fea083..3ec4c4337b5dfd1cdc7aa7fbf11180b9b33a7344 100644
--- a/ipc/ipc_channel_proxy_unittest.cc
+++ b/ipc/ipc_channel_proxy_unittest.cc
@@ -269,7 +269,12 @@ class IPCChannelProxyTest : public IPCTestBase {
scoped_ptr<QuitListener> listener_;
};
-TEST_F(IPCChannelProxyTest, MessageClassFilters) {
+#if defined(OS_ANDROID)
+#define MAYBE_MessageClassFilters DISABLED_MessageClassFilters
+#else
+#define MAYBE_MessageClassFilters MessageClassFilters
+#endif
+TEST_F(IPCChannelProxyTest, MAYBE_MessageClassFilters) {
// Construct a filter per message class.
std::vector<scoped_refptr<MessageCountFilter> > class_filters;
class_filters.push_back(make_scoped_refptr(
@@ -293,7 +298,12 @@ TEST_F(IPCChannelProxyTest, MessageClassFilters) {
EXPECT_EQ(1U, class_filters[i]->messages_received());
}
-TEST_F(IPCChannelProxyTest, GlobalAndMessageClassFilters) {
+#if defined(OS_ANDROID)
+#define MAYBE_GlobalAndMessageClassFilters DISABLED_GlobalAndMessageClassFilters
+#else
+#define MAYBE_GlobalAndMessageClassFilters GlobalAndMessageClassFilters
+#endif
+TEST_F(IPCChannelProxyTest, MAYBE_GlobalAndMessageClassFilters) {
// Add a class and global filter.
scoped_refptr<MessageCountFilter> class_filter(
new MessageCountFilter(TestMsgStart));
@@ -322,7 +332,12 @@ TEST_F(IPCChannelProxyTest, GlobalAndMessageClassFilters) {
EXPECT_EQ(3U, global_filter->messages_received());
}
-TEST_F(IPCChannelProxyTest, FilterRemoval) {
+#if defined(OS_ANDROID)
+#define MAYBE_FilterRemoval DISABLED_FilterRemoval
+#else
+#define MAYBE_FilterRemoval FilterRemoval
+#endif
+TEST_F(IPCChannelProxyTest, MAYBE_FilterRemoval) {
// Add a class and global filter.
scoped_refptr<MessageCountFilter> class_filter(
new MessageCountFilter(TestMsgStart));
« no previous file with comments | « ipc/ipc_channel_posix_unittest.cc ('k') | ipc/ipc_channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698