From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/lazy_instance_unittest.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'chromium/base/lazy_instance_unittest.cc') diff --git a/chromium/base/lazy_instance_unittest.cc b/chromium/base/lazy_instance_unittest.cc index d1012ef6984..ad1f0ebf44c 100644 --- a/chromium/base/lazy_instance_unittest.cc +++ b/chromium/base/lazy_instance_unittest.cc @@ -5,6 +5,7 @@ #include #include +#include #include #include "base/at_exit.h" @@ -13,6 +14,7 @@ #include "base/barrier_closure.h" #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/memory/aligned_memory.h" #include "base/system/sys_info.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" @@ -178,9 +180,6 @@ class AlignedData { } // namespace -#define EXPECT_ALIGNED(ptr, align) \ - EXPECT_EQ(0u, reinterpret_cast(ptr) & (align - 1)) - TEST(LazyInstanceTest, Alignment) { using base::LazyInstance; @@ -194,9 +193,9 @@ TEST(LazyInstanceTest, Alignment) { static LazyInstance>::DestructorAtExit align4096 = LAZY_INSTANCE_INITIALIZER; - EXPECT_ALIGNED(align4.Pointer(), 4); - EXPECT_ALIGNED(align32.Pointer(), 32); - EXPECT_ALIGNED(align4096.Pointer(), 4096); + EXPECT_TRUE(base::IsAligned(align4.Pointer(), 4)); + EXPECT_TRUE(base::IsAligned(align32.Pointer(), 32)); + EXPECT_TRUE(base::IsAligned(align4096.Pointer(), 4096)); } namespace { -- cgit v1.2.1