Update from https://crrev.com/311076

base/memory/discardable_shared_memory.h

Index: base/memory/discardable_shared_memory.h
diff --git a/base/memory/discardable_shared_memory.h b/base/memory/discardable_shared_memory.h
index c69c970edc8c0d6f7dd21985c30e57d007aeb89e..abee8687a86ee43547057274386244275517d035 100644
--- a/base/memory/discardable_shared_memory.h
+++ b/base/memory/discardable_shared_memory.h
@@ -11,7 +11,7 @@
 #include "base/threading/thread_collision_warner.h"
 #include "base/time/time.h"
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 #include <set>
 #endif
 
@@ -119,7 +119,7 @@ class BASE_EXPORT DiscardableSharedMemory {
   SharedMemory shared_memory_;
   size_t mapped_size_;
   size_t locked_page_count_;
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   std::set<size_t> locked_pages_;
 #endif
   // Implementation is not thread-safe but still usable if clients are