| Index: ipc/ipc_sync_channel_unittest.cc
|
| diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
|
| index 0341d5a7775d462cf93adcc3636320adc0e55465..a0968c7a051d5a6f0d9ad9f79a603cdba5ee1f43 100644
|
| --- a/ipc/ipc_sync_channel_unittest.cc
|
| +++ b/ipc/ipc_sync_channel_unittest.cc
|
| @@ -155,7 +155,7 @@ class Worker : public Listener, public Sender {
|
| virtual SyncChannel* CreateChannel() {
|
| scoped_ptr<SyncChannel> channel = SyncChannel::Create(
|
| channel_name_, mode_, this, ipc_thread_.task_runner().get(), true,
|
| - &shutdown_event_, nullptr);
|
| + &shutdown_event_);
|
| return channel.release();
|
| }
|
|
|
| @@ -332,7 +332,8 @@ class TwoStepServer : public Worker {
|
| SyncChannel* channel =
|
| SyncChannel::Create(channel_name(), mode(), this,
|
| ipc_thread().task_runner().get(), create_pipe_now_,
|
| - shutdown_event(), nullptr).release();
|
| + shutdown_event())
|
| + .release();
|
| return channel;
|
| }
|
|
|
| @@ -354,7 +355,8 @@ class TwoStepClient : public Worker {
|
| SyncChannel* channel =
|
| SyncChannel::Create(channel_name(), mode(), this,
|
| ipc_thread().task_runner().get(), create_pipe_now_,
|
| - shutdown_event(), nullptr).release();
|
| + shutdown_event())
|
| + .release();
|
| return channel;
|
| }
|
|
|
| @@ -1159,7 +1161,7 @@ class RestrictedDispatchClient : public Worker {
|
|
|
| non_restricted_channel_ = SyncChannel::Create(
|
| "non_restricted_channel", IPC::Channel::MODE_CLIENT, this,
|
| - ipc_thread().task_runner().get(), true, shutdown_event(), nullptr);
|
| + ipc_thread().task_runner().get(), true, shutdown_event());
|
|
|
| server_->ListenerThread()->task_runner()->PostTask(
|
| FROM_HERE, base::Bind(&RestrictedDispatchServer::OnDoPing, server_, 2));
|
| @@ -1546,7 +1548,7 @@ class RestrictedDispatchPipeWorker : public Worker {
|
| event2_->Wait();
|
| other_channel_ = SyncChannel::Create(
|
| other_channel_name_, IPC::Channel::MODE_CLIENT, this,
|
| - ipc_thread().task_runner().get(), true, shutdown_event(), nullptr);
|
| + ipc_thread().task_runner().get(), true, shutdown_event());
|
| other_channel_->SetRestrictDispatchChannelGroup(group_);
|
| if (!is_first()) {
|
| event1_->Signal();
|
| @@ -1628,7 +1630,7 @@ class ReentrantReplyServer1 : public Worker {
|
| void Run() override {
|
| server2_channel_ = SyncChannel::Create(
|
| "reentrant_reply2", IPC::Channel::MODE_CLIENT, this,
|
| - ipc_thread().task_runner().get(), true, shutdown_event(), nullptr);
|
| + ipc_thread().task_runner().get(), true, shutdown_event());
|
| server_ready_->Signal();
|
| Message* msg = new SyncChannelTestMsg_Reentrant1();
|
| server2_channel_->Send(msg);
|
|
|