| Index: mojo/edk/test/multiprocess_test_helper.cc
|
| diff --git a/mojo/edk/test/multiprocess_test_helper.cc b/mojo/edk/test/multiprocess_test_helper.cc
|
| index ed96e1d0e98d1befca0a13f9f9bae9a1fed98ecb..75700cecc0d6c2790f0937b0ba8a8e163eec8d2b 100644
|
| --- a/mojo/edk/test/multiprocess_test_helper.cc
|
| +++ b/mojo/edk/test/multiprocess_test_helper.cc
|
| @@ -135,13 +135,10 @@ ScopedMessagePipeHandle MultiprocessTestHelper::StartChildWithExtraSwitch(
|
|
|
| base::LaunchOptions options;
|
| #if defined(OS_POSIX)
|
| - options.fds_to_remap = &handle_passing_info;
|
| + options.fds_to_remap = handle_passing_info;
|
| #elif defined(OS_WIN)
|
| options.start_hidden = true;
|
| - if (base::win::GetVersion() >= base::win::VERSION_VISTA)
|
| - options.handles_to_inherit = &handle_passing_info;
|
| - else
|
| - options.inherit_handles = true;
|
| + options.inherit_mode = base::LaunchOptions::Inherit::kAll;
|
| #else
|
| #error "Not supported yet."
|
| #endif
|
|
|