diff options
Diffstat (limited to 'base/test/multiprocess_test.cc')
| -rw-r--r-- | base/test/multiprocess_test.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc index fcc4d123ed..c8fd3eddad 100644 --- a/base/test/multiprocess_test.cc +++ b/base/test/multiprocess_test.cc @@ -13,7 +13,7 @@ namespace base { #if !defined(OS_ANDROID) && !defined(__ANDROID__) && !defined(__ANDROID_HOST__) -Process SpawnMultiProcessTestChild( +SpawnChildResult SpawnMultiProcessTestChild( const std::string& procname, const CommandLine& base_command_line, const LaunchOptions& options) { @@ -24,7 +24,9 @@ Process SpawnMultiProcessTestChild( if (!command_line.HasSwitch(switches::kTestChildProcess)) command_line.AppendSwitchASCII(switches::kTestChildProcess, procname); - return LaunchProcess(command_line, options); + SpawnChildResult result; + result.process = LaunchProcess(command_line, options); + return result; } bool WaitForMultiprocessTestChildExit(const Process& process, @@ -54,7 +56,7 @@ MultiProcessTest::MultiProcessTest() { // Don't compile on Arc++. #if 0 -Process MultiProcessTest::SpawnChild(const std::string& procname) { +SpawnChildResult MultiProcessTest::SpawnChild(const std::string& procname) { LaunchOptions options; #if defined(OS_WIN) options.start_hidden = true; @@ -62,7 +64,7 @@ Process MultiProcessTest::SpawnChild(const std::string& procname) { return SpawnChildWithOptions(procname, options); } -Process MultiProcessTest::SpawnChildWithOptions( +SpawnChildResult MultiProcessTest::SpawnChildWithOptions( const std::string& procname, const LaunchOptions& options) { return SpawnMultiProcessTestChild(procname, MakeCmdLine(procname), options); |