Revert of Mojo: Specify/check alignment of pointers more carefully.

mojo/system/shared_buffer_dispatcher.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/system/shared_buffer_dispatcher.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/public/c/system/macros.h"
 #include "mojo/system/constants.h"
 #include "mojo/system/memory.h"
 #include "mojo/system/raw_shared_buffer.h"
 
 namespace mojo {
 namespace system {
 
 namespace {
 
 struct SerializedSharedBufferDispatcher {
@@ skipping 121 matching lines @@
   shared_buffer.swap(shared_buffer_);
   return scoped_refptr<Dispatcher>(new SharedBufferDispatcher(shared_buffer));
 }
 
 MojoResult SharedBufferDispatcher::DuplicateBufferHandleImplNoLock(
     const MojoDuplicateBufferHandleOptions* options,
     scoped_refptr<Dispatcher>* new_dispatcher) {
   lock().AssertAcquired();
   if (options) {
     // The |struct_size| field must be valid to read.
-    if (!VerifyUserPointer<uint32_t>(&options->struct_size))
+    if (!VerifyUserPointer<uint32_t>(&options->struct_size, 1))
       return MOJO_RESULT_INVALID_ARGUMENT;
     // And then |options| must point to at least |options->struct_size| bytes.
-    if (!VerifyUserPointerWithSize<MOJO_ALIGNOF(int64_t)>(options,
-                                                          options->struct_size))
+    if (!VerifyUserPointer<void>(options, options->struct_size))
       return MOJO_RESULT_INVALID_ARGUMENT;
 
     if (options->struct_size < sizeof(*options))
       return MOJO_RESULT_INVALID_ARGUMENT;
     // We don't actually do anything with |options|.
   }
 
   *new_dispatcher = new SharedBufferDispatcher(shared_buffer_);
   return MOJO_RESULT_OK;
 }
@@ skipping 70 matching lines @@
   return MOJO_WAIT_FLAG_NONE;
 }
 
 MojoWaitFlags SharedBufferDispatcher::SatisfiableFlagsNoLock() const {
   // TODO(vtl): Add transferrable flag.
   return MOJO_WAIT_FLAG_NONE;
 }
 
 }  // namespace system
 }  // namespace mojo