Upgrade AlignedMemory to support dynamic allocations.

base/memory/aligned_memory_unittest.cc

 // Copyright (c) 2012 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 "base/memory/aligned_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define EXPECT_ALIGNED(ptr, align) \
     EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(ptr) & (align - 1))
@@ skipping 33 matching lines @@
   EXPECT_ALIGNED(raw256.void_data(), 256);
 
   // TODO(ios): This test hits an armv7 bug in clang. crbug.com/138066
 #if !(defined(OS_IOS) && defined(ARCH_CPU_ARM_FAMILY))
   AlignedMemory<8, 4096> raw4096;
   EXPECT_EQ(4096u, ALIGNOF(raw4096));
   EXPECT_ALIGNED(raw4096.void_data(), 4096);
 #endif  // !(defined(OS_IOS) && defined(ARCH_CPU_ARM_FAMILY))
 }
 
+TEST(AlignedMemoryTest, DynamicAllocation) {
+  void* p = base::AlignedAlloc(8, 8);
+  EXPECT_TRUE(p);
+  EXPECT_ALIGNED(p, 8);
+  base::AlignedFree(p);
+
+  p = base::AlignedAlloc(8, 16);
+  EXPECT_TRUE(p);
+  EXPECT_ALIGNED(p, 16);
+  base::AlignedFree(p);
+
+  p = base::AlignedAlloc(8, 256);
+  EXPECT_TRUE(p);
+  EXPECT_ALIGNED(p, 256);
+  base::AlignedFree(p);
+
+  p = base::AlignedAlloc(8, 4096);
+  EXPECT_TRUE(p);
+  EXPECT_ALIGNED(p, 4096);
+  base::AlignedFree(p);
+}
+
+TEST(AlignedMemoryTest, ScopedDynamicAllocation) {
+  scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> p(
+      reinterpret_cast<float*>(base::AlignedAlloc(8, 8)));

[Jeffrey Yasskin, 2012/07/23 18:34:40]

static_cast here too.

[DaleCurtis, 2012/07/23 19:04:27]

Done.

+  EXPECT_TRUE(p.get());
+  EXPECT_ALIGNED(p.get(), 8);
+}
+
 }  // namespace