| Index: mojo/system/message_pipe.cc
|
| diff --git a/mojo/system/message_pipe.cc b/mojo/system/message_pipe.cc
|
| index c3dd57fab1590db426dea3ac38f64bfafe3ff6c2..2cff5df77e1bd56401dafdafab6d3d412b411c20 100644
|
| --- a/mojo/system/message_pipe.cc
|
| +++ b/mojo/system/message_pipe.cc
|
| @@ -176,31 +176,25 @@ MojoResult MessagePipe::EnqueueMessage(unsigned port,
|
| return EnqueueMessageInternal(port, message.Pass(), NULL);
|
| }
|
|
|
| -bool MessagePipe::Attach(unsigned port,
|
| - ChannelEndpoint* channel_endpoint,
|
| - Channel* channel,
|
| - MessageInTransit::EndpointId local_id) {
|
| +bool MessagePipe::Attach(unsigned port, ChannelEndpoint* channel_endpoint) {
|
| DCHECK(port == 0 || port == 1);
|
| DCHECK(channel_endpoint);
|
| - DCHECK(channel);
|
| - DCHECK_NE(local_id, MessageInTransit::kInvalidEndpointId);
|
|
|
| base::AutoLock locker(lock_);
|
| if (!endpoints_[port])
|
| return false;
|
|
|
| DCHECK_EQ(endpoints_[port]->GetType(), MessagePipeEndpoint::kTypeProxy);
|
| - endpoints_[port]->Attach(channel_endpoint, channel, local_id);
|
| + endpoints_[port]->Attach(channel_endpoint);
|
| return true;
|
| }
|
|
|
| -void MessagePipe::Run(unsigned port, MessageInTransit::EndpointId remote_id) {
|
| +void MessagePipe::Run(unsigned port) {
|
| DCHECK(port == 0 || port == 1);
|
| - DCHECK_NE(remote_id, MessageInTransit::kInvalidEndpointId);
|
|
|
| base::AutoLock locker(lock_);
|
| DCHECK(endpoints_[port]);
|
| - if (!endpoints_[port]->Run(remote_id))
|
| + if (!endpoints_[port]->Run())
|
| endpoints_[port].reset();
|
| }
|
|
|
|
|