text: --- base/process/memory_unittest.cc.orig	2020-03-16 18:39:41 UTC
  +++ base/process/memory_unittest.cc
  @@ -106,7 +106,7 @@ TEST(MemoryTest, AllocatorShimWorking) {
   // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
   // configurations: only test the real allocator.
   // Windows only supports these tests with the allocator shim in place.
  -#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
  +#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
       !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
   
   namespace {
  @@ -589,5 +589,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
     EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
     EXPECT_TRUE(value_ == nullptr);
   }
  -#endif  // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) &&
  +#endif  // !defined(OS_BSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) &&
           // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
  