| Index: third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
|
| index 52faefa4c6e783aaea5f95afb1290e7779f0b3e6..638e743ead6cec7640af42ac9a8c05a7208182f3 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
|
| +++ b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
|
| @@ -30,8 +30,10 @@ void EndpointRelayer::Init(ChannelEndpoint* endpoint0,
|
| endpoints_[1] = endpoint1;
|
| }
|
|
|
| -bool EndpointRelayer::OnReadMessage(unsigned port, MessageInTransit* message) {
|
| - DCHECK(message);
|
| +bool EndpointRelayer::OnReadMessage(
|
| + unsigned port,
|
| + MessageInTransit::ReadContext& reading_message) {
|
| + DCHECK(!reading_message.passed());
|
|
|
| base::AutoLock locker(lock_);
|
|
|
| @@ -42,7 +44,7 @@ bool EndpointRelayer::OnReadMessage(unsigned port, MessageInTransit* message) {
|
| // Otherwise, consume it even if the peer port is closed.
|
| unsigned peer_port = GetPeerPort(port);
|
| if (endpoints_[peer_port])
|
| - endpoints_[peer_port]->EnqueueMessage(make_scoped_ptr(message));
|
| + endpoints_[peer_port]->EnqueueMessage(reading_message.PassMessage());
|
| return true;
|
| }
|
|
|
|
|