| Index: mojo/edk/system/message_pipe_dispatcher.cc
|
| diff --git a/mojo/edk/system/message_pipe_dispatcher.cc b/mojo/edk/system/message_pipe_dispatcher.cc
|
| index df861df47612311a17c9ec37fc4ee892238c2c9a..a6733dbe324dfb1f4c118cfa5648390834db2c1b 100644
|
| --- a/mojo/edk/system/message_pipe_dispatcher.cc
|
| +++ b/mojo/edk/system/message_pipe_dispatcher.cc
|
| @@ -60,7 +60,7 @@ MojoResult MessagePipeDispatcher::ValidateCreateOptions(
|
|
|
| void MessagePipeDispatcher::Init(scoped_refptr<MessagePipe> message_pipe,
|
| unsigned port) {
|
| - DCHECK(message_pipe.get());
|
| + DCHECK(message_pipe);
|
| DCHECK(port == 0 || port == 1);
|
|
|
| message_pipe_ = message_pipe;
|
| @@ -92,7 +92,7 @@ scoped_refptr<MessagePipeDispatcher> MessagePipeDispatcher::Deserialize(
|
| scoped_refptr<MessagePipe> message_pipe;
|
| if (!MessagePipe::Deserialize(channel, source, size, &message_pipe, &port))
|
| return nullptr;
|
| - DCHECK(message_pipe.get());
|
| + DCHECK(message_pipe);
|
| DCHECK(port == 0 || port == 1);
|
|
|
| scoped_refptr<MessagePipeDispatcher> dispatcher(
|
| @@ -103,7 +103,7 @@ scoped_refptr<MessagePipeDispatcher> MessagePipeDispatcher::Deserialize(
|
|
|
| MessagePipeDispatcher::~MessagePipeDispatcher() {
|
| // |Close()|/|CloseImplNoLock()| should have taken care of the pipe.
|
| - DCHECK(!message_pipe_.get());
|
| + DCHECK(!message_pipe_);
|
| }
|
|
|
| MessagePipe* MessagePipeDispatcher::GetMessagePipeNoLock() const {
|
| @@ -116,9 +116,9 @@ unsigned MessagePipeDispatcher::GetPortNoLock() const {
|
| return port_;
|
| }
|
|
|
| -void MessagePipeDispatcher::CancelAllWaitersNoLock() {
|
| +void MessagePipeDispatcher::CancelAllAwakablesNoLock() {
|
| lock().AssertAcquired();
|
| - message_pipe_->CancelAllWaiters(port_);
|
| + message_pipe_->CancelAllAwakables(port_);
|
| }
|
|
|
| void MessagePipeDispatcher::CloseImplNoLock() {
|
| @@ -178,21 +178,21 @@ HandleSignalsState MessagePipeDispatcher::GetHandleSignalsStateImplNoLock()
|
| return message_pipe_->GetHandleSignalsState(port_);
|
| }
|
|
|
| -MojoResult MessagePipeDispatcher::AddWaiterImplNoLock(
|
| - Waiter* waiter,
|
| +MojoResult MessagePipeDispatcher::AddAwakableImplNoLock(
|
| + Awakable* awakable,
|
| MojoHandleSignals signals,
|
| uint32_t context,
|
| HandleSignalsState* signals_state) {
|
| lock().AssertAcquired();
|
| - return message_pipe_->AddWaiter(port_, waiter, signals, context,
|
| - signals_state);
|
| + return message_pipe_->AddAwakable(port_, awakable, signals, context,
|
| + signals_state);
|
| }
|
|
|
| -void MessagePipeDispatcher::RemoveWaiterImplNoLock(
|
| - Waiter* waiter,
|
| +void MessagePipeDispatcher::RemoveAwakableImplNoLock(
|
| + Awakable* awakable,
|
| HandleSignalsState* signals_state) {
|
| lock().AssertAcquired();
|
| - message_pipe_->RemoveWaiter(port_, waiter, signals_state);
|
| + message_pipe_->RemoveAwakable(port_, awakable, signals_state);
|
| }
|
|
|
| void MessagePipeDispatcher::StartSerializeImplNoLock(
|
|
|