diff options
| author | sammc <sammc@chromium.org> | 2016-03-09 17:42:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 01:43:27 +0000 |
| commit | 013cfed7ecf91b0700bec7147631d4fbedb6b64e (patch) | |
| tree | 756cf2ff9fb0fe1ad81363cee2c6582ee30f7d5c /tools/ipc_fuzzer | |
| parent | 2292849b75d884faff3d77c37b4fcf9743e13388 (diff) | |
| download | chromium_src-013cfed7ecf91b0700bec7147631d4fbedb6b64e.zip chromium_src-013cfed7ecf91b0700bec7147631d4fbedb6b64e.tar.gz chromium_src-013cfed7ecf91b0700bec7147631d4fbedb6b64e.tar.bz2 | |
Fix failing tests with ChannelMojo enabled.
This ChannelMojo to:
- take a ScopedMessagePipeHandle instead of a string token so an
in-process renderer can be passed the message pipe directly;
- send brokered attachments as mojo handles; and
- offer messages to AttachmentBroker.
This also fixes and re-enables ipc_channel_mojo_unittest.cc.
BUG=579813
Review URL: https://codereview.chromium.org/1768903002
Cr-Commit-Position: refs/heads/master@{#380294}
Diffstat (limited to 'tools/ipc_fuzzer')
| -rw-r--r-- | tools/ipc_fuzzer/message_replay/replay_process.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/ipc_fuzzer/message_replay/replay_process.cc b/tools/ipc_fuzzer/message_replay/replay_process.cc index 114ebd7..54b56de 100644 --- a/tools/ipc_fuzzer/message_replay/replay_process.cc +++ b/tools/ipc_fuzzer/message_replay/replay_process.cc @@ -112,8 +112,10 @@ void ReplayProcess::OpenChannel() { base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kMojoChannelToken); channel_ = IPC::ChannelProxy::Create( - IPC::ChannelMojo::CreateClientFactory(token), this, - io_thread_.task_runner()); + IPC::ChannelMojo::CreateClientFactory(mojo::edk::CreateChildMessagePipe( + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kMojoChannelToken))), + this, io_thread_.task_runner()); } else { std::string channel_name = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |