Unify usage of logging/assert macros in base/

base/logging.h

 // Copyright (c) 2012 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_LOGGING_H_
 #define BASE_LOGGING_H_
 
 #include <stddef.h>
 
 #include <cassert>
@@ skipping 624 matching lines @@
 
 #define DLOG_IS_ON(severity) false
 #define DLOG_IF(severity, condition) EAT_STREAM_PARAMETERS
 #define DLOG_ASSERT(condition) EAT_STREAM_PARAMETERS
 #define DPLOG_IF(severity, condition) EAT_STREAM_PARAMETERS
 #define DVLOG_IF(verboselevel, condition) EAT_STREAM_PARAMETERS
 #define DVPLOG_IF(verboselevel, condition) EAT_STREAM_PARAMETERS
 
 #endif  // ENABLE_DLOG
 
-// DEBUG_MODE is for uses like
+// DEBUG_MODE is for runtime uses like
 //   if (DEBUG_MODE) foo.CheckThatFoo();
-// instead of
-//   #ifndef NDEBUG
-//     foo.CheckThatFoo();
-//   #endif
+// We tie its state to ENABLE_DLOG.
 //
-// We tie its state to ENABLE_DLOG.
+// For compile-time checks, #if ENABLE_DLOG can be used.
 enum { DEBUG_MODE = ENABLE_DLOG };
 
-#undef ENABLE_DLOG

[danakj, 2016/07/19 20:17:01]

Hm.. idk why we need both here. Can we just delete ENABLE_DLOG and use
DCHECK_IS_ON()?

[gab, 2016/07/20 02:43:58]

Sure, though it's a bit weird to have

#if DCHECK_IS_ON()
  bool result =
#endif
     MyCallWithResult();
  DLOG_IF(!result, "blah");

because DLOG and DCHECK are two different things. So I understand wanting two
macros even if they have the same definition... That's why I wanted to add
DLOG_IS_ON() but it already exists and means something else... Maybe we could
add DLOG_IS_ENABLED()?

Anyways, replaced ENABLE_DLOG with DCHECK_IS_ON() directly for now, let me know
what you think.

-
 #define DLOG(severity)                                          \
   LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity))
 
 #define DPLOG(severity)                                         \
   LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity))
 
 #define DVLOG(verboselevel) DVLOG_IF(verboselevel, VLOG_IS_ON(verboselevel))
 
 #define DVPLOG(verboselevel) DVPLOG_IF(verboselevel, VLOG_IS_ON(verboselevel))
 
@@ skipping 321 matching lines @@
 #elif NOTIMPLEMENTED_POLICY == 5
 #define NOTIMPLEMENTED() do {\
   static bool logged_once = false;\
   LOG_IF(ERROR, !logged_once) << NOTIMPLEMENTED_MSG;\
   logged_once = true;\
 } while(0);\
 EAT_STREAM_PARAMETERS
 #endif
 
 #endif  // BASE_LOGGING_H_