| 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 65d216f82119da5d0db020e6f3db274bc463a7e7..26cc6acc8f3d1ec835f1d4cbd3bb415689562503 100644
|
| --- a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
|
| +++ b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
|
| @@ -42,7 +42,13 @@ void TestingDelegate::OnBootstrapError() {
|
| base::MessageLoop::current()->Quit();
|
| }
|
|
|
| -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) {
|
| Init("IPCMojoBootstrapTestClient");
|
|
|
| TestingDelegate delegate;
|
|
|