ipc/ipc_test_base.cc - Issue 1950143003: Re-land: Re-enable multi-process IPC tests on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ipc/ipc_test_base.cc

Issue 1950143003: Re-land: Re-enable multi-process IPC tests on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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

Index: ipc/ipc_test_base.cc

diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc

index 831a59ad98ee515c0971f99d3d7e0dd322dc260c..757d9f5bb626e854946719e59555824c6f25665a 100644

--- a/ipc/ipc_test_base.cc

+++ b/ipc/ipc_test_base.cc

@@ -144,8 +144,13 @@ bool IPCTestBase::WaitForClientShutdown() {

DCHECK(client_process_.IsValid());

int exit_code;

+#if defined(OS_ANDROID)

+ bool rv = AndroidWaitForChildExitWithTimeout(

+ client_process_, base::TimeDelta::FromSeconds(5), &exit_code);

+#else

bool rv = client_process_.WaitForExitWithTimeout(

base::TimeDelta::FromSeconds(5), &exit_code);

+#endif // defined(OS_ANDROID)

client_process_.Close();

return rv;

}

« no previous file with comments | « ipc/ipc_send_fds_test.cc ('k') | ipc/mojo/ipc_mojo_bootstrap_unittest.cc » ('j') | no next file with comments »