Mojo C++ bindings: make ipc/ mojom targets to use STL string/vector types

ipc/ipc_message_pipe_reader.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 "ipc/ipc_message_pipe_reader.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 68 matching lines @@
   sender_.reset();
   if (binding_.is_bound())
     binding_.Close();
 }
 
 bool MessagePipeReader::Send(std::unique_ptr<Message> message) {
   TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"),
                          "MessagePipeReader::Send",
                          message->flags(),
                          TRACE_EVENT_FLAG_FLOW_OUT);
-  mojo::Array<mojom::SerializedHandlePtr> handles(nullptr);
+  base::Optional<std::vector<mojom::SerializedHandlePtr>> handles;
   MojoResult result = MOJO_RESULT_OK;
   result = ChannelMojo::ReadFromMessageAttachmentSet(message.get(), &handles);
   if (result != MOJO_RESULT_OK)
     return false;
 
-  mojo::Array<uint8_t> data(message->size());
+  std::vector<uint8_t> data(message->size());
   std::copy(reinterpret_cast<const uint8_t*>(message->data()),
             reinterpret_cast<const uint8_t*>(message->data()) + message->size(),
-            &data[0]);
+            data.data());
 
   MessageSerializer serializer;
   mojom::ChannelProxy proxy(&serializer);
-  proxy.Receive(std::move(data), std::move(handles));
+  proxy.Receive(data, std::move(handles));
   mojo::Message* mojo_message = serializer.message();
 
   size_t num_handles = mojo_message->handles()->size();
   DCHECK_LE(num_handles, std::numeric_limits<uint32_t>::max());
 
   mojo_message->set_interface_id(sender_interface_id_);
   result = mojo::WriteMessageNew(sender_pipe_, mojo_message->TakeMojoMessage(),
                                  MOJO_WRITE_MESSAGE_FLAG_NONE);
 
   DVLOG(4) << "Send " << message->type() << ": " << message->size();
   return result == MOJO_RESULT_OK;
 }
 
 void MessagePipeReader::GetRemoteInterface(
     const std::string& name,
     mojo::ScopedInterfaceEndpointHandle handle) {
   if (!sender_.is_bound())
     return;
   mojom::GenericInterfaceAssociatedRequest request;
   request.Bind(std::move(handle));
   sender_->GetAssociatedInterface(name, std::move(request));
 }
 
 void MessagePipeReader::SetPeerPid(int32_t peer_pid) {
   peer_pid_ = peer_pid;
   delegate_->OnPeerPidReceived();
 }
 
 void MessagePipeReader::Receive(
-    mojo::Array<uint8_t> data,
-    mojo::Array<mojom::SerializedHandlePtr> handles) {
+    const std::vector<uint8_t>& data,
+    base::Optional<std::vector<mojom::SerializedHandlePtr>> handles) {
   DCHECK_NE(peer_pid_, base::kNullProcessId);
   Message message(
-      data.size() == 0 ? "" : reinterpret_cast<const char*>(&data[0]),
+      data.empty() ? "" : reinterpret_cast<const char*>(data.data()),
       static_cast<uint32_t>(data.size()));
   message.set_sender_pid(peer_pid_);
 
   DVLOG(4) << "Receive " << message.type() << ": " << message.size();
   MojoResult write_result =
       ChannelMojo::WriteToMessageAttachmentSet(std::move(handles), &message);
   if (write_result != MOJO_RESULT_OK) {
     OnPipeError(write_result);
     return;
   }
 
   TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("ipc.flow"),
                          "MessagePipeReader::Receive",
                          message.flags(),
                          TRACE_EVENT_FLAG_FLOW_IN);
   delegate_->OnMessageReceived(message);
 }
 
 void MessagePipeReader::GetAssociatedInterface(
-    const mojo::String& name,
+    const std::string& name,
     mojom::GenericInterfaceAssociatedRequest request) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (delegate_)
     delegate_->OnAssociatedInterfaceRequest(name, request.PassHandle());
 }
 
 void MessagePipeReader::OnPipeError(MojoResult error) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   Close();
 
   // NOTE: The delegate call below may delete |this|.
   if (delegate_)
     delegate_->OnPipeError();
 }
 
 }  // namespace internal
 }  // namespace IPC