Mojo C++ bindings: introduce an optional array to store transferred interface IDs in messages.

mojo/public/cpp/bindings/tests/router_test_util.cc

 // Copyright 2015 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/public/cpp/bindings/tests/router_test_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
 #include "mojo/public/cpp/bindings/tests/message_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 
 void AllocRequestMessage(uint32_t name, const char* text, Message* message) {
   size_t payload_size = strlen(text) + 1;  // Plus null terminator.
-  internal::RequestMessageBuilder builder(name, payload_size);
+  internal::MessageBuilder builder(name, Message::kFlagExpectsResponse,
+                                   payload_size, 0);
   memcpy(builder.buffer()->Allocate(payload_size), text, payload_size);
   *message = std::move(*builder.message());
 }
 
 void AllocResponseMessage(uint32_t name,
                           const char* text,
                           uint64_t request_id,
                           Message* message) {
   size_t payload_size = strlen(text) + 1;  // Plus null terminator.
-  internal::ResponseMessageBuilder builder(name, payload_size, request_id);
+  internal::MessageBuilder builder(name, Message::kFlagIsResponse, payload_size,
+                                   0);
+  builder.message()->set_request_id(request_id);
   memcpy(builder.buffer()->Allocate(payload_size), text, payload_size);
   *message = std::move(*builder.message());
 }
 
 MessageAccumulator::MessageAccumulator(MessageQueue* queue,
                                        const base::Closure& closure)
     : queue_(queue), closure_(closure) {}
 
 MessageAccumulator::~MessageAccumulator() {}
 
@@ skipping 62 matching lines @@
 void LazyResponseGenerator::Complete(bool send_response) {
   if (send_response) {
     SendResponse(name_, request_id_, request_string_.c_str(), responder_);
   }
   delete responder_;
   responder_ = nullptr;
 }
 
 }  // namespace test
 }  // namespace mojo