Index: mojo/edk/system/data_pipe_consumer_dispatcher.cc |
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.cc b/mojo/edk/system/data_pipe_consumer_dispatcher.cc |
index 3c14f35c1ac6e1882fc86da52dbf20d60edf084e..21127c62fce6be0ff95153b3ab5b0cd3b9c77570 100644 |
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.cc |
+++ b/mojo/edk/system/data_pipe_consumer_dispatcher.cc |
@@ -15,7 +15,7 @@ DataPipeConsumerDispatcher::DataPipeConsumerDispatcher() { |
} |
void DataPipeConsumerDispatcher::Init(scoped_refptr<DataPipe> data_pipe) { |
- DCHECK(data_pipe.get()); |
+ DCHECK(data_pipe); |
data_pipe_ = data_pipe; |
} |
@@ -25,12 +25,12 @@ Dispatcher::Type DataPipeConsumerDispatcher::GetType() const { |
DataPipeConsumerDispatcher::~DataPipeConsumerDispatcher() { |
// |Close()|/|CloseImplNoLock()| should have taken care of the pipe. |
- DCHECK(!data_pipe_.get()); |
+ DCHECK(!data_pipe_); |
} |
-void DataPipeConsumerDispatcher::CancelAllWaitersNoLock() { |
+void DataPipeConsumerDispatcher::CancelAllAwakablesNoLock() { |
lock().AssertAcquired(); |
- data_pipe_->ConsumerCancelAllWaiters(); |
+ data_pipe_->ConsumerCancelAllAwakables(); |
} |
void DataPipeConsumerDispatcher::CloseImplNoLock() { |
@@ -109,20 +109,21 @@ HandleSignalsState DataPipeConsumerDispatcher::GetHandleSignalsStateImplNoLock() |
return data_pipe_->ConsumerGetHandleSignalsState(); |
} |
-MojoResult DataPipeConsumerDispatcher::AddWaiterImplNoLock( |
- Waiter* waiter, |
+MojoResult DataPipeConsumerDispatcher::AddAwakableImplNoLock( |
+ Awakable* awakable, |
MojoHandleSignals signals, |
uint32_t context, |
HandleSignalsState* signals_state) { |
lock().AssertAcquired(); |
- return data_pipe_->ConsumerAddWaiter(waiter, signals, context, signals_state); |
+ return data_pipe_->ConsumerAddAwakable(awakable, signals, context, |
+ signals_state); |
} |
-void DataPipeConsumerDispatcher::RemoveWaiterImplNoLock( |
- Waiter* waiter, |
+void DataPipeConsumerDispatcher::RemoveAwakableImplNoLock( |
+ Awakable* awakable, |
HandleSignalsState* signals_state) { |
lock().AssertAcquired(); |
- data_pipe_->ConsumerRemoveWaiter(waiter, signals_state); |
+ data_pipe_->ConsumerRemoveAwakable(awakable, signals_state); |
} |
bool DataPipeConsumerDispatcher::IsBusyNoLock() const { |