Index: base/test/multiprocess_test_android.cc |
diff --git a/base/test/multiprocess_test_android.cc b/base/test/multiprocess_test_android.cc |
index c74f013da1cacc0ca292de356c5ad746c08c5b31..a1b8fcbfc00c564eb73075caf685d1fd5c9210a2 100644 |
--- a/base/test/multiprocess_test_android.cc |
+++ b/base/test/multiprocess_test_android.cc |
@@ -25,9 +25,10 @@ namespace base { |
// - All options except |fds_to_remap| are ignored. |
// |
// NOTE: This MUST NOT run on the main thread of the NativeTest application. |
-Process SpawnMultiProcessTestChild(const std::string& procname, |
- const CommandLine& base_command_line, |
- const LaunchOptions& options) { |
+SpawnChildResult SpawnMultiProcessTestChild( |
+ const std::string& procname, |
+ const CommandLine& base_command_line, |
+ const LaunchOptions& options) { |
JNIEnv* env = android::AttachCurrentThread(); |
DCHECK(env); |
@@ -54,7 +55,10 @@ Process SpawnMultiProcessTestChild(const std::string& procname, |
android::ToJavaArrayOfStrings(env, command_line.argv()); |
jint pid = android::Java_MultiprocessTestClientLauncher_launchClient( |
env, android::GetApplicationContext(), j_argv, fds); |
- return Process(pid); |
+ |
+ SpawnChildResult result; |
+ result.process = Process(pid); |
+ return result; |
} |
bool WaitForMultiprocessTestChildExit(const Process& process, |