Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.

mojo/edk/system/options_validation.h

Index: mojo/edk/system/options_validation.h
diff --git a/third_party/mojo/src/mojo/edk/system/options_validation.h b/mojo/edk/system/options_validation.h
similarity index 63%
copy from third_party/mojo/src/mojo/edk/system/options_validation.h
copy to mojo/edk/system/options_validation.h
index a325b10d23d88792d5cf2c98a4f91e2786f12bc3..7ea1a1cecd04c5eb7209c01744ba370edbd9251d 100644
--- a/third_party/mojo/src/mojo/edk/system/options_validation.h
+++ b/mojo/edk/system/options_validation.h
@@ -8,8 +8,8 @@
 // but any |flags| specified must be known to the system (otherwise, an error of
 // |MOJO_RESULT_UNIMPLEMENTED| should be returned).
 
-#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
-#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
+#ifndef MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
+#define MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,25 +17,23 @@
 #include <algorithm>
 
 #include "base/logging.h"
+#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "third_party/mojo/src/mojo/edk/system/memory.h"
-#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
 
 namespace mojo {
-namespace system {
+namespace edk {
 
 template <class Options>
 class UserOptionsReader {
  public:
-  // Constructor from a |UserPointer<const Options>| (which it checks -- this
-  // constructor has side effects!).
+  // Constructor from a |const* Options| (which it checks -- this constructor
+  // has side effects!).
   // Note: We initialize |options_reader_| without checking, since we do a check
   // in |GetSizeForReader()|.
-  explicit UserOptionsReader(UserPointer<const Options> options)
-      : options_reader_(UserPointer<const char>::Reader::NoCheck(),
-                        options.template ReinterpretCast<const char>(),
-                        GetSizeForReader(options)) {
+  explicit UserOptionsReader(const Options* options) {
+    CHECK(options && IsAligned<MOJO_ALIGNOF(Options)>(options));
+    options_ = GetSizeForReader(options) == 0 ? nullptr : options;
     static_assert(offsetof(Options, struct_size) == 0,
                   "struct_size not first member of Options");
     // TODO(vtl): Enable when MSVC supports this (C++11 extended sizeof):
@@ -44,11 +42,11 @@ class UserOptionsReader {
     // (Or maybe assert that its type is uint32_t?)
   }
 
-  bool is_valid() const { return !!options_reader_.GetPointer(); }
+  bool is_valid() const { return !!options_; }
 
   const Options& options() const {
     DCHECK(is_valid());
-    return *reinterpret_cast<const Options*>(options_reader_.GetPointer());
+    return *options_;
   }
 
   // Checks that the given (variable-size) |options| passed to the constructor
@@ -63,23 +61,20 @@ class UserOptionsReader {
   }
 
  private:
-  static inline size_t GetSizeForReader(UserPointer<const Options> options) {
-    uint32_t struct_size =
-        options.template ReinterpretCast<const uint32_t>().Get();
+  static inline size_t GetSizeForReader(const Options* options) {
+    uint32_t struct_size = *reinterpret_cast<const uint32_t*>(options);
     if (struct_size < sizeof(uint32_t))
       return 0;
 
-    // Check the full requested size.
-    // Note: Use |MOJO_ALIGNOF()| here to match the exact macro used in the
-    // declaration of Options structs.
-    internal::CheckUserPointerWithSize<MOJO_ALIGNOF(Options)>(options.pointer_,
-                                                              struct_size);
-    options.template ReinterpretCast<const char>().CheckArray(struct_size);
-    // But we'll never look at more than |sizeof(Options)| bytes.
     return std::min(static_cast<size_t>(struct_size), sizeof(Options));
   }
 
-  UserPointer<const char>::Reader options_reader_;
+  template <size_t alignment>
+  static bool IsAligned(const void* pointer) {
+    return reinterpret_cast<uintptr_t>(pointer) % alignment == 0;
+  }
+
+  const Options* options_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserOptionsReader);
 };
@@ -96,7 +91,7 @@ class UserOptionsReader {
 #define OPTIONS_STRUCT_HAS_MEMBER(Options, member, reader) \
   reader.HasMember(offsetof(Options, member), sizeof(reader.options().member))
 
-}  // namespace system
+}  // namespace edk
 }  // namespace mojo
 
-#endif  // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_
+#endif  // MOJO_EDK_SYSTEM_OPTIONS_VALIDATION_H_