Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(770)

Unified Diff: base/process/memory_unittest.cc

Issue 2907563002: allocator/Windows: delete the old non-unified allocator-shim (Closed)
Patch Set: fix allocator_shim_define Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/process/memory_unittest.cc
diff --git a/base/process/memory_unittest.cc b/base/process/memory_unittest.cc
index 535d2c4241c055fce9e8a48f877a2fe196e48ff3..ca6a1126184fef8b37138521e8343a3d26a7cfed 100644
--- a/base/process/memory_unittest.cc
+++ b/base/process/memory_unittest.cc
@@ -104,8 +104,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(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \
+#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
Sigurður Ásgeirsson 2017/05/25 12:54:21 _EXPERIMENTAL_ missing?
!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
namespace {

Powered by Google App Engine
This is Rietveld 408576698