Remove base's ALIGNOF/ALIGNAS in favor of alignof/alignas.

base/memory/singleton_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 <stdint.h>
 
 #include "base/at_exit.h"
 #include "base/memory/singleton.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 258 matching lines @@
     EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(ptr) & (align - 1))
 
 TEST_F(SingletonTest, Alignment) {
   using base::AlignedMemory;
 
   // Create some static singletons 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.
   AlignedTestSingleton<int32_t>* align4 =
       AlignedTestSingleton<int32_t>::GetInstance();
+  AlignedTestSingleton<AlignedMemory<8, 8>>* align8 =
+      AlignedTestSingleton<AlignedMemory<8, 8>>::GetInstance();
+  AlignedTestSingleton<AlignedMemory<16, 16>>* align16 =
+      AlignedTestSingleton<AlignedMemory<16, 16>>::GetInstance();
   AlignedTestSingleton<AlignedMemory<32, 32> >* align32 =
       AlignedTestSingleton<AlignedMemory<32, 32> >::GetInstance();
-  AlignedTestSingleton<AlignedMemory<128, 128> >* align128 =
-      AlignedTestSingleton<AlignedMemory<128, 128> >::GetInstance();
-  AlignedTestSingleton<AlignedMemory<4096, 4096> >* align4096 =
-      AlignedTestSingleton<AlignedMemory<4096, 4096> >::GetInstance();
+  AlignedTestSingleton<AlignedMemory<64, 64>>* align64 =
+      AlignedTestSingleton<AlignedMemory<64, 64>>::GetInstance();
 
   EXPECT_ALIGNED(align4, 4);
+  EXPECT_ALIGNED(align8, 8);
+  EXPECT_ALIGNED(align16, 16);
   EXPECT_ALIGNED(align32, 32);
-  EXPECT_ALIGNED(align128, 128);
-  EXPECT_ALIGNED(align4096, 4096);
+  EXPECT_ALIGNED(align64, 64);
 }
 
 }  // namespace
 }  // namespace base