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

base/memory/singleton_unittest.cc

Index: base/memory/singleton_unittest.cc
diff --git a/base/memory/singleton_unittest.cc b/base/memory/singleton_unittest.cc
index a15145c8747145cb3f6e6774890307cc0fa46794..dd3ce97a6aaca33bd15d70d57efb2e5efbd6eb56 100644
--- a/base/memory/singleton_unittest.cc
+++ b/base/memory/singleton_unittest.cc
@@ -278,15 +278,21 @@ TEST_F(SingletonTest, Alignment) {
       AlignedTestSingleton<int32_t>::GetInstance();
   AlignedTestSingleton<AlignedMemory<32, 32> >* align32 =
       AlignedTestSingleton<AlignedMemory<32, 32> >::GetInstance();
+// GCC doesn't like alignment >64 on ARM.

[danakj, 2017/02/08 21:29:47]

Same?

[dcheng, 2017/02/09 00:01:24]

Done.

+#if !defined(ARCH_CPU_ARM_FAMILY) || defined(__clang__)
   AlignedTestSingleton<AlignedMemory<128, 128> >* align128 =
       AlignedTestSingleton<AlignedMemory<128, 128> >::GetInstance();
   AlignedTestSingleton<AlignedMemory<4096, 4096> >* align4096 =
       AlignedTestSingleton<AlignedMemory<4096, 4096> >::GetInstance();
+#endif
 
   EXPECT_ALIGNED(align4, 4);
   EXPECT_ALIGNED(align32, 32);
+// GCC doesn't like alignment >64 on ARM.
+#if !defined(ARCH_CPU_ARM_FAMILY) || defined(__clang__)
   EXPECT_ALIGNED(align128, 128);
   EXPECT_ALIGNED(align4096, 4096);
+#endif
 }
 
 }  // namespace