Use C++11 alignment primitives

base/lazy_instance_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 <stddef.h>
 
 #include "base/at_exit.h"
 #include "base/atomic_sequence_num.h"
 #include "base/lazy_instance.h"
-#include "base/memory/aligned_memory.h"
 #include "base/threading/simple_thread.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 base::StaticAtomicSequenceNumber constructed_seq_;
 base::StaticAtomicSequenceNumber destructed_seq_;
 
 class ConstructAndDestructLogger {
  public:
   ConstructAndDestructLogger() {
@@ skipping 123 matching lines @@
   EXPECT_FALSE(deleted2);
 }
 
 namespace {
 
 template <size_t alignment>
 class AlignedData {
  public:
   AlignedData() {}
   ~AlignedData() {}
-  base::AlignedMemory<alignment, alignment> data_;
+  alignas(alignment) char data_[alignment];
 };
 
-}  // anonymous namespace
+}  // namespace
 
 #define EXPECT_ALIGNED(ptr, align) \
     EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(ptr) & (align - 1))
 
 TEST(LazyInstanceTest, Alignment) {
   using base::LazyInstance;
 
   // Create some static instances with increasing sizes and alignment
   // requirements. By ordering this way, the linker will need to do some work to
   // ensure proper alignment of the static data.
   static LazyInstance<AlignedData<4>>::DestructorAtExit align4 =
       LAZY_INSTANCE_INITIALIZER;
   static LazyInstance<AlignedData<32>>::DestructorAtExit align32 =
       LAZY_INSTANCE_INITIALIZER;
   static LazyInstance<AlignedData<4096>>::DestructorAtExit align4096 =
       LAZY_INSTANCE_INITIALIZER;
 
   EXPECT_ALIGNED(align4.Pointer(), 4);
   EXPECT_ALIGNED(align32.Pointer(), 32);
   EXPECT_ALIGNED(align4096.Pointer(), 4096);
 }