| Index: ipc/ipc_mojo_bootstrap_unittest.cc
|
| diff --git a/ipc/ipc_mojo_bootstrap_unittest.cc b/ipc/ipc_mojo_bootstrap_unittest.cc
|
| index 9d4aaf732dab2e5162c03f40169a76ad72daf9c3..876ce67bfef9357f3ff2b53e4292265984d022b4 100644
|
| --- a/ipc/ipc_mojo_bootstrap_unittest.cc
|
| +++ b/ipc/ipc_mojo_bootstrap_unittest.cc
|
| @@ -35,9 +35,10 @@
|
| explicit TestingDelegate(const base::Closure& quit_callback)
|
| : passed_(false), quit_callback_(quit_callback) {}
|
|
|
| - void OnPipesAvailable(
|
| - IPC::mojom::ChannelAssociatedPtr sender,
|
| - IPC::mojom::ChannelAssociatedRequest receiver) override;
|
| + void OnPipesAvailable(IPC::mojom::ChannelAssociatedPtrInfo send_channel,
|
| + IPC::mojom::ChannelAssociatedRequest receive_channel,
|
| + int32_t peer_pid) override;
|
| + void OnBootstrapError() override;
|
|
|
| bool passed() const { return passed_; }
|
|
|
| @@ -47,9 +48,14 @@
|
| };
|
|
|
| void TestingDelegate::OnPipesAvailable(
|
| - IPC::mojom::ChannelAssociatedPtr sender,
|
| - IPC::mojom::ChannelAssociatedRequest receiver) {
|
| + IPC::mojom::ChannelAssociatedPtrInfo send_channel,
|
| + IPC::mojom::ChannelAssociatedRequest receive_channel,
|
| + int32_t peer_pid) {
|
| passed_ = true;
|
| + quit_callback_.Run();
|
| +}
|
| +
|
| +void TestingDelegate::OnBootstrapError() {
|
| quit_callback_.Run();
|
| }
|
|
|
| @@ -59,8 +65,7 @@
|
| TestingDelegate delegate(run_loop.QuitClosure());
|
| std::unique_ptr<IPC::MojoBootstrap> bootstrap = IPC::MojoBootstrap::Create(
|
| helper_.StartChild("IPCMojoBootstrapTestClient"),
|
| - IPC::Channel::MODE_SERVER, &delegate,
|
| - base::ThreadTaskRunnerHandle::Get());
|
| + IPC::Channel::MODE_SERVER, &delegate);
|
|
|
| bootstrap->Connect();
|
| run_loop.Run();
|
| @@ -79,8 +84,7 @@
|
| std::unique_ptr<IPC::MojoBootstrap> bootstrap = IPC::MojoBootstrap::Create(
|
| mojo::edk::CreateChildMessagePipe(
|
| mojo::edk::test::MultiprocessTestHelper::primordial_pipe_token),
|
| - IPC::Channel::MODE_CLIENT, &delegate,
|
| - base::ThreadTaskRunnerHandle::Get());
|
| + IPC::Channel::MODE_CLIENT, &delegate);
|
|
|
| bootstrap->Connect();
|
|
|
|
|