Index: mojo/edk/system/message_pipe.cc |
diff --git a/mojo/edk/system/message_pipe.cc b/mojo/edk/system/message_pipe.cc |
index f6ffb9800bb07a6862421f8c9c384406fc56a91d..5c73ac98ec1125c0d21e9f858c83003f4f642397 100644 |
--- a/mojo/edk/system/message_pipe.cc |
+++ b/mojo/edk/system/message_pipe.cc |
@@ -176,19 +176,8 @@ MojoResult MessagePipe::ReadMessage(unsigned port, |
MutexLocker locker(&mutex_); |
DCHECK(endpoints_[port]); |
- // TODO(vtl): The code below is temporary scaffolding, until I can update the |
- // endpoint code. This should be just: |
- // return endpoints_[port]->ReadMessage(bytes, num_bytes, handles, |
- // num_handles, flags); |
- DispatcherVector dispatchers; |
- MojoResult rv = endpoints_[port]->ReadMessage(bytes, num_bytes, &dispatchers, |
- num_handles, flags); |
- for (size_t i = 0; i < dispatchers.size(); i++) { |
- // We're not enforcing handle rights yet, so "none" is OK. |
- handles->push_back( |
- Handle(std::move(dispatchers[i]), MOJO_HANDLE_RIGHT_NONE)); |
- } |
- return rv; |
+ return endpoints_[port]->ReadMessage(bytes, num_bytes, handles, num_handles, |
+ flags); |
} |
HandleSignalsState MessagePipe::GetHandleSignalsState(unsigned port) const { |