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

Unified Diff: chrome/installer/setup/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: chrome/installer/setup/memory_unittest.cc
diff --git a/chrome/installer/setup/memory_unittest.cc b/chrome/installer/setup/memory_unittest.cc
index a7968e37dcbe5cc993a34bdc117c3c34ba4efd40..d254ba50b44e572c14c39d55100ddf3236958027 100644
--- a/chrome/installer/setup/memory_unittest.cc
+++ b/chrome/installer/setup/memory_unittest.cc
@@ -6,6 +6,7 @@
#include <limits>
+#include "base/allocator/features.h"
#include "base/process/memory.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -13,7 +14,7 @@
#include "base/allocator/allocator_interception_mac.h"
#endif
-#if defined(ALLOCATOR_SHIM)
+#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
Sigurður Ásgeirsson 2017/05/25 12:54:21 OT: is it not time to drop the _EXPERIMENTAL_ in t
// Test that the allocator shim is in-place so that base::UncheckedMalloc works.
TEST(OutOfMemoryHandledTest, UncheckedMalloc) {
// Enable termination on OOM - just as setup.exe does at early initialization
@@ -40,4 +41,4 @@ TEST(OutOfMemoryHandledTest, UncheckedMalloc) {
base::allocator::UninterceptMallocZonesForTesting();
#endif
}
-#endif // ALLOCATOR_SHIM
+#endif // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)

Powered by Google App Engine
This is Rietveld 408576698