Index: ipc/mojo/ipc_mojo_bootstrap_unittest.cc |
diff --git a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc |
index 4fa52e2a1c57172db898437cfccec23d4a1f4dbd..dcf68bd2b14c3f2050f0a630e95fb8ee1c438428 100644 |
--- a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc |
+++ b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc |
@@ -59,7 +59,13 @@ |
quit_callback_.Run(); |
} |
-TEST_F(IPCMojoBootstrapTest, Connect) { |
+// Times out on Android; see http://crbug.com/502290 |
+#if defined(OS_ANDROID) |
+#define MAYBE_Connect DISABLED_Connect |
+#else |
+#define MAYBE_Connect Connect |
+#endif |
+TEST_F(IPCMojoBootstrapTest, MAYBE_Connect) { |
base::MessageLoop message_loop; |
base::RunLoop run_loop; |
TestingDelegate delegate(run_loop.QuitClosure()); |