| 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 1f6f07947736428784dfba2cba1cc6ea58eed517..da0ec921bb5bd7b6e2b8207f90978eb41b737831 100644
|
| --- a/mojo/edk/system/data_pipe_consumer_dispatcher.cc
|
| +++ b/mojo/edk/system/data_pipe_consumer_dispatcher.cc
|
| @@ -80,7 +80,7 @@ Dispatcher::Type DataPipeConsumerDispatcher::GetType() const {
|
| return Type::DATA_PIPE_CONSUMER;
|
| }
|
|
|
| -MojoResult DataPipeConsumerDispatcher::Close() {
|
| +MojoResult DataPipeConsumerDispatcher::Close(RequestContext* request_context) {
|
| base::AutoLock lock(lock_);
|
| DVLOG(1) << "Closing data pipe consumer " << pipe_id_;
|
| return CloseNoLock();
|
| @@ -316,7 +316,7 @@ bool DataPipeConsumerDispatcher::EndSerialize(
|
| return true;
|
| }
|
|
|
| -bool DataPipeConsumerDispatcher::BeginTransit() {
|
| +bool DataPipeConsumerDispatcher::BeginTransit(RequestContext* request_context) {
|
| base::AutoLock lock(lock_);
|
| if (in_transit_)
|
| return false;
|
| @@ -324,7 +324,8 @@ bool DataPipeConsumerDispatcher::BeginTransit() {
|
| return in_transit_;
|
| }
|
|
|
| -void DataPipeConsumerDispatcher::CompleteTransitAndClose() {
|
| +void DataPipeConsumerDispatcher::CompleteTransitAndClose(
|
| + RequestContext* request_context) {
|
| node_controller_->SetPortObserver(control_port_, nullptr);
|
|
|
| base::AutoLock lock(lock_);
|
| @@ -335,7 +336,8 @@ void DataPipeConsumerDispatcher::CompleteTransitAndClose() {
|
| CloseNoLock();
|
| }
|
|
|
| -void DataPipeConsumerDispatcher::CancelTransit() {
|
| +void DataPipeConsumerDispatcher::CancelTransit(
|
| + RequestContext* request_context) {
|
| base::AutoLock lock(lock_);
|
| DCHECK(in_transit_);
|
| in_transit_ = false;
|
|
|