Update from https://crrev.com/311076

base/memory/discardable_shared_memory.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_MEMORY_DISCARDABLE_SHARED_MEMORY_H_
 #define BASE_MEMORY_DISCARDABLE_SHARED_MEMORY_H_
 
 #include "base/base_export.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/threading/thread_collision_warner.h"
 #include "base/time/time.h"
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 #include <set>
 #endif
 
 namespace base {
 
 // Platform abstraction for discardable shared memory.
 //
 // This class is not thread-safe. Clients are responsible for synchronizing
 // access to an instance of this class.
 class BASE_EXPORT DiscardableSharedMemory {
@@ skipping 87 matching lines @@
     return shared_memory_.ShareToProcess(process_handle, new_handle);
   }
 
  private:
   // Virtual for tests.
   virtual Time Now() const;
 
   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
   // synchronized somehow. Use a collision warner to detect incorrect usage.
   DFAKE_MUTEX(thread_collision_warner_);
   Time last_known_usage_;
 
   DISALLOW_COPY_AND_ASSIGN(DiscardableSharedMemory);
 };
 
 }  // namespace base
 
 #endif  // BASE_MEMORY_DISCARDABLE_SHARED_MEMORY_H_