Make ChannelEndpoint::OnReadMessage() take a MessageInTransit instead of a MessageInTransit::View.

mojo/edk/system/channel_endpoint.cc

 // Copyright 2014 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/channel_endpoint.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/channel_endpoint_client.h"
-#include "mojo/edk/system/transport_data.h"
 
 namespace mojo {
 namespace system {
 
 ChannelEndpoint::ChannelEndpoint(ChannelEndpointClient* client,
                                  unsigned client_port,
                                  MessageInTransitQueue* message_queue)
     : client_(client), client_port_(client_port), channel_(nullptr) {
   DCHECK(client_.get() || message_queue);
 
@@ skipping 57 matching lines @@
   }
 
   if (!client_.get()) {
     channel_->DetachEndpoint(this, local_id_, remote_id_);
     channel_ = nullptr;
     local_id_ = ChannelEndpointId();
     remote_id_ = ChannelEndpointId();
   }
 }
 
-bool ChannelEndpoint::OnReadMessage(
-    const MessageInTransit::View& message_view,
-    embedder::ScopedPlatformHandleVectorPtr platform_handles) {
-  scoped_ptr<MessageInTransit> message(new MessageInTransit(message_view));
+bool ChannelEndpoint::OnReadMessage(scoped_ptr<MessageInTransit> message) {
   scoped_refptr<ChannelEndpointClient> client;
   unsigned client_port;
   {
     base::AutoLock locker(lock_);
     DCHECK(channel_);
     if (!client_.get()) {
       // This isn't a failure per se. (It just means that, e.g., the other end
       // of the message point closed first.)
       return true;
     }
 
-    if (message_view.transport_data_buffer_size() > 0) {
-      DCHECK(message_view.transport_data_buffer());
-      message->SetDispatchers(TransportData::DeserializeDispatchers(
-          message_view.transport_data_buffer(),
-          message_view.transport_data_buffer_size(), platform_handles.Pass(),
-          channel_));
-    }
-
     // Take a ref, and call |OnReadMessage()| outside the lock.
     client = client_;
     client_port = client_port_;
   }
 
   return client->OnReadMessage(client_port, message.Pass());
 }
 
 void ChannelEndpoint::DetachFromChannel() {
   scoped_refptr<ChannelEndpointClient> client;
@@ skipping 40 matching lines @@
   DCHECK(remote_id_.is_valid());
 
   message->SerializeAndCloseDispatchers(channel_);
   message->set_source_id(local_id_);
   message->set_destination_id(remote_id_);
   return channel_->WriteMessage(message.Pass());
 }
 
 }  // namespace system
 }  // namespace mojo