| Index: base/test/multiprocess_test.cc
|
| diff --git a/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc
|
| index 306c1090fec769167d1734ad81d00fb1b7f90a66..b95ea9823e37500ea5a033ae066df7332aaeacf2 100644
|
| --- a/base/test/multiprocess_test.cc
|
| +++ b/base/test/multiprocess_test.cc
|
| @@ -10,7 +10,7 @@
|
| namespace base {
|
|
|
| #if !defined(OS_ANDROID)
|
| -ProcessHandle SpawnMultiProcessTestChild(
|
| +Process SpawnMultiProcessTestChild(
|
| const std::string& procname,
|
| const CommandLine& base_command_line,
|
| const LaunchOptions& options) {
|
| @@ -21,9 +21,7 @@ ProcessHandle SpawnMultiProcessTestChild(
|
| if (!command_line.HasSwitch(switches::kTestChildProcess))
|
| command_line.AppendSwitchASCII(switches::kTestChildProcess, procname);
|
|
|
| - ProcessHandle handle = kNullProcessHandle;
|
| - LaunchProcess(command_line, options, &handle);
|
| - return handle;
|
| + return LaunchProcess(command_line, options);
|
| }
|
| #endif // !defined(OS_ANDROID)
|
|
|
| @@ -36,7 +34,7 @@ CommandLine GetMultiProcessTestChildBaseCommandLine() {
|
| MultiProcessTest::MultiProcessTest() {
|
| }
|
|
|
| -ProcessHandle MultiProcessTest::SpawnChild(const std::string& procname) {
|
| +Process MultiProcessTest::SpawnChild(const std::string& procname) {
|
| LaunchOptions options;
|
| #if defined(OS_WIN)
|
| options.start_hidden = true;
|
| @@ -44,7 +42,7 @@ ProcessHandle MultiProcessTest::SpawnChild(const std::string& procname) {
|
| return SpawnChildWithOptions(procname, options);
|
| }
|
|
|
| -ProcessHandle MultiProcessTest::SpawnChildWithOptions(
|
| +Process MultiProcessTest::SpawnChildWithOptions(
|
| const std::string& procname,
|
| const LaunchOptions& options) {
|
| return SpawnMultiProcessTestChild(procname, MakeCmdLine(procname), options);
|
|
|