| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/test/multiprocess_test.h" | 5 #include "base/test/multiprocess_test.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 | 9 |
| 10 #if defined(OS_POSIX) | 10 #if defined(OS_POSIX) |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 cl.AppendSwitch(switches::kDebugOnStart); | 40 cl.AppendSwitch(switches::kDebugOnStart); |
| 41 return cl; | 41 return cl; |
| 42 } | 42 } |
| 43 | 43 |
| 44 ProcessHandle MultiProcessTest::SpawnChildImpl( | 44 ProcessHandle MultiProcessTest::SpawnChildImpl( |
| 45 const std::string& procname, | 45 const std::string& procname, |
| 46 const file_handle_mapping_vector& fds_to_map, | 46 const file_handle_mapping_vector& fds_to_map, |
| 47 bool debug_on_start) { | 47 bool debug_on_start) { |
| 48 ProcessHandle handle = kNullProcessHandle; | 48 ProcessHandle handle = kNullProcessHandle; |
| 49 base::LaunchOptions options; | 49 base::LaunchOptions options; |
| 50 options.process_handle = &handle; | |
| 51 #if defined(OS_WIN) | 50 #if defined(OS_WIN) |
| 52 options.start_hidden = true; | 51 options.start_hidden = true; |
| 53 #else | 52 #else |
| 54 options.fds_to_remap = &fds_to_map; | 53 options.fds_to_remap = &fds_to_map; |
| 55 #endif | 54 #endif |
| 56 base::LaunchProcess(MakeCmdLine(procname, debug_on_start), options); | 55 base::LaunchProcess(MakeCmdLine(procname, debug_on_start), options, &handle); |
| 57 return handle; | 56 return handle; |
| 58 } | 57 } |
| 59 | 58 |
| 60 } // namespace base | 59 } // namespace base |
| OLD | NEW |