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

mojo/system/shared_buffer_dispatcher.cc

Index: mojo/system/shared_buffer_dispatcher.cc
diff --git a/mojo/system/shared_buffer_dispatcher.cc b/mojo/system/shared_buffer_dispatcher.cc
index 841c6596ad4e09af67473884b1cc914c4895cec3..29f1de5675887561c940594cf7d469c5e35ebe96 100644
--- a/mojo/system/shared_buffer_dispatcher.cc
+++ b/mojo/system/shared_buffer_dispatcher.cc
@@ -8,7 +8,6 @@
 
 #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"
@@ -150,11 +149,10 @@
   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))