| Index: ipc/ipc_test_base.cc
|
| diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc
|
| index 6243138cd4b6cb08c4d3c3993c4308f61b9d39e1..5e86eaabea917f8972a3f22e208a26b1232fbef5 100644
|
| --- a/ipc/ipc_test_base.cc
|
| +++ b/ipc/ipc_test_base.cc
|
| @@ -81,7 +81,7 @@ void IPCTestBase::CreateChannelFromChannelHandle(
|
| CHECK(!channel_.get());
|
| CHECK(!channel_proxy_.get());
|
| channel_ = CreateChannelFactory(
|
| - channel_handle, task_runner().get())->BuildChannel(listener);
|
| + channel_handle, io_task_runner().get())->BuildChannel(listener);
|
| }
|
|
|
| void IPCTestBase::CreateChannelProxy(
|
| @@ -125,6 +125,7 @@ bool IPCTestBase::StartClientWithFD(int ipcfd) {
|
| kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
|
| base::LaunchOptions options;
|
| options.fds_to_remap = &fds_to_map;
|
| + AboutToSpawnChild(&options);
|
| client_process_ = SpawnChildWithOptions(GetTestMainName(), options);
|
|
|
| return DidStartClient();
|
| @@ -134,7 +135,11 @@ bool IPCTestBase::StartClientWithFD(int ipcfd) {
|
|
|
| bool IPCTestBase::StartClient() {
|
| DCHECK(!client_process_.IsValid());
|
| - client_process_ = SpawnChild(GetTestMainName());
|
| + base::LaunchOptions options;
|
| + base::HandlesToInheritVector handles_to_inherit;
|
| + options.handles_to_inherit = &handles_to_inherit;
|
| + AboutToSpawnChild(&options);
|
| + client_process_ = SpawnChildWithOptions(GetTestMainName(), options);
|
| return DidStartClient();
|
| }
|
|
|
| @@ -154,12 +159,12 @@ IPC::ChannelHandle IPCTestBase::GetTestChannelHandle() {
|
| return GetChannelName(test_client_name_);
|
| }
|
|
|
| -scoped_refptr<base::SequencedTaskRunner> IPCTestBase::task_runner() {
|
| +scoped_refptr<base::TaskRunner> IPCTestBase::io_task_runner() {
|
| return message_loop_->task_runner();
|
| }
|
|
|
| scoped_ptr<IPC::ChannelFactory> IPCTestBase::CreateChannelFactory(
|
| const IPC::ChannelHandle& handle,
|
| - base::SequencedTaskRunner* runner) {
|
| + base::TaskRunner* runner) {
|
| return IPC::ChannelFactory::Create(handle, IPC::Channel::MODE_SERVER);
|
| }
|
|
|