EDK: Plumb Handle/HandleVector one more layer down.

mojo/edk/system/message_pipe.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/message_pipe.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 158 matching lines @@
                                     UserPointer<void> bytes,
                                     UserPointer<uint32_t> num_bytes,
                                     HandleVector* handles,
                                     uint32_t* num_handles,
                                     MojoReadMessageFlags flags) {
   DCHECK(port == 0 || port == 1);
 
   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 {
   DCHECK(port == 0 || port == 1);
 
   MutexLocker locker(&mutex_);
   DCHECK(endpoints_[port]);
 
   return endpoints_[port]->GetHandleSignalsState();
 }
@@ skipping 181 matching lines @@
       LOG(WARNING) << "Enqueueing null dispatcher";
       dispatchers->push_back(nullptr);
     }
   }
   message->SetDispatchers(std::move(dispatchers));
   return MOJO_RESULT_OK;
 }
 
 }  // namespace system
 }  // namespace mojo