Re-land: Re-enable multi-process IPC tests on Android.

ipc/mojo/ipc_mojo_bootstrap_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
 
 #include <stdint.h>
 #include <memory>
 
 #include "base/base_paths.h"
@@ skipping 41 matching lines @@
     IPC::mojom::ChannelAssociatedRequest receive_channel,
     int32_t peer_pid) {
   passed_ = true;
   quit_callback_.Run();
 }
 
 void TestingDelegate::OnBootstrapError() {
   quit_callback_.Run();
 }
 
-// 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) {
+TEST_F(IPCMojoBootstrapTest, Connect) {
   base::MessageLoop message_loop;
   base::RunLoop run_loop;
   TestingDelegate delegate(run_loop.QuitClosure());
   std::unique_ptr<IPC::MojoBootstrap> bootstrap = IPC::MojoBootstrap::Create(
       helper_.StartChild("IPCMojoBootstrapTestClient"),
       IPC::Channel::MODE_SERVER, &delegate);
 
   bootstrap->Connect();
   run_loop.Run();
 
@@ skipping 14 matching lines @@
       IPC::Channel::MODE_CLIENT, &delegate);
 
   bootstrap->Connect();
 
   run_loop.Run();
 
   return delegate.passed() ? 0 : 1;
 }
 
 }  // namespace