Mojo: Plumb MojoCreateMessagePipeOptions through to the C++ wrappers.

mojo/public/cpp/system/core.h

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_SYSTEM_CORE_H_
 #define MOJO_PUBLIC_CPP_SYSTEM_CORE_H_
 
 #include <assert.h>
 #include <stddef.h>
 
@@ skipping 246 matching lines @@
 };
 
 MOJO_COMPILE_ASSERT(sizeof(MessagePipeHandle) == sizeof(Handle),
                     bad_size_for_cpp_MessagePipeHandle);
 
 typedef ScopedHandleBase<MessagePipeHandle> ScopedMessagePipeHandle;
 MOJO_COMPILE_ASSERT(sizeof(ScopedMessagePipeHandle) ==
                         sizeof(MessagePipeHandle),
                     bad_size_for_cpp_ScopedMessagePipeHandle);
 
-inline MojoResult CreateMessagePipe(ScopedMessagePipeHandle* message_pipe0,
+inline MojoResult CreateMessagePipe(const MojoCreateMessagePipeOptions* options,
+                                    ScopedMessagePipeHandle* message_pipe0,
                                     ScopedMessagePipeHandle* message_pipe1) {
   assert(message_pipe0);
   assert(message_pipe1);
   MessagePipeHandle handle0;
   MessagePipeHandle handle1;
-  // TODO(vtl): Add support for the options struct.
-  MojoResult rv = MojoCreateMessagePipe(NULL,
+  MojoResult rv = MojoCreateMessagePipe(options,
                                         handle0.mutable_value(),
                                         handle1.mutable_value());
   // Reset even on failure (reduces the chances that a "stale"/incorrect handle
   // will be used).
   message_pipe0->reset(handle0);
   message_pipe1->reset(handle1);
   return rv;
 }
 
 // These "raw" versions fully expose the underlying API, but don't help with
@@ skipping 17 matching lines @@
                                  MojoReadMessageFlags flags) {
   return MojoReadMessage(message_pipe.value(), bytes, num_bytes, handles,
                          num_handles, flags);
 }
 
 // A wrapper class that automatically creates a message pipe and owns both
 // handles.
 class MessagePipe {
  public:
   MessagePipe();
+  explicit MessagePipe(const MojoCreateMessagePipeOptions& options);
   ~MessagePipe();
 
   ScopedMessagePipeHandle handle0;
   ScopedMessagePipeHandle handle1;
 };
 
 inline MessagePipe::MessagePipe() {
-  MojoResult result MOJO_ALLOW_UNUSED = CreateMessagePipe(&handle0, &handle1);
+  MojoResult result MOJO_ALLOW_UNUSED =
+      CreateMessagePipe(NULL, &handle0, &handle1);
   assert(result == MOJO_RESULT_OK);
 }
 
+inline MessagePipe::MessagePipe(const MojoCreateMessagePipeOptions& options) {
+  MojoResult result MOJO_ALLOW_UNUSED =
+      CreateMessagePipe(&options, &handle0, &handle1);
+  assert(result == MOJO_RESULT_OK);
+}
+
 inline MessagePipe::~MessagePipe() {
 }
 
 // DataPipeProducerHandle and DataPipeConsumerHandle ---------------------------
 
 class DataPipeProducerHandle : public Handle {
  public:
   DataPipeProducerHandle() {}
   explicit DataPipeProducerHandle(MojoHandle value) : Handle(value) {}
 
@@ skipping 201 matching lines @@
       CreateSharedBuffer(&options, num_bytes, &handle);
   assert(result == MOJO_RESULT_OK);
 }
 
 inline SharedBuffer::~SharedBuffer() {
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_SYSTEM_CORE_H_