Revert 268405 "Make sure that ScratchBuffer::Allocate() always r..."

trunk/src/mojo/public/cpp/bindings/lib/scratch_buffer.cc

Index: trunk/src/mojo/public/cpp/bindings/lib/scratch_buffer.cc
===================================================================
--- trunk/src/mojo/public/cpp/bindings/lib/scratch_buffer.cc	(revision 268433)
+++ trunk/src/mojo/public/cpp/bindings/lib/scratch_buffer.cc	(working copy)
@@ -80,12 +80,11 @@
     return false;
 
   // Ensure segment buffer is aligned.
-  size_t padded_segment_size = internal::Align(sizeof(Segment));
-  Segment* segment = static_cast<Segment*>(
-      malloc(padded_segment_size + delta));
+  size_t segment_size = internal::Align(sizeof(Segment)) + delta;
+  Segment* segment = static_cast<Segment*>(malloc(segment_size));
   if (segment) {
     segment->next = overflow_;
-    segment->cursor = reinterpret_cast<char*>(segment) + padded_segment_size;
+    segment->cursor = reinterpret_cast<char*>(segment + 1);
     segment->end = segment->cursor + delta;
     overflow_ = segment;
     return true;