Use the new ScopedMachVM class and the MACH_LOG family of logging macros

base/mac/mach_logging.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_MAC_MACH_LOGGING_H_
 #define BASE_MAC_MACH_LOGGING_H_
 
 #include <mach/mach.h>
 
 #include "base/basictypes.h"
@@ skipping 43 matching lines @@
   ~BootstrapLogMessage();
 
  private:
   kern_return_t bootstrap_err_;
 
   DISALLOW_COPY_AND_ASSIGN(BootstrapLogMessage);
 };
 
 }  // namespace logging
 
+#if defined(NDEBUG)
+#define MACH_DVLOG_IS_ON(verbose_level) 0
+#else
+#define MACH_DVLOG_IS_ON(verbose_level) VLOG_IS_ON(verbose_level)
+#endif
+
 #define MACH_LOG_STREAM(severity, mach_err) \
     COMPACT_GOOGLE_LOG_EX_ ## severity(MachLogMessage, mach_err).stream()
 #define MACH_VLOG_STREAM(verbose_level, mach_err) \
     logging::MachLogMessage(__FILE__, __LINE__, \
                             -verbose_level, mach_err).stream()
 
 #define MACH_LOG(severity, mach_err) \
     LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), LOG_IS_ON(severity))
 #define MACH_LOG_IF(severity, condition, mach_err) \
     LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
@@ skipping 11 matching lines @@
     << "Check failed: " # condition << ". "
 
 #define MACH_DLOG(severity, mach_err) \
     LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), DLOG_IS_ON(severity))
 #define MACH_DLOG_IF(severity, condition, mach_err) \
     LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
                 DLOG_IS_ON(severity) && (condition))
 
 #define MACH_DVLOG(verbose_level, mach_err) \
     LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                DVLOG_IS_ON(verbose_level))
+                MACH_DVLOG_IS_ON(verbose_level))
 #define MACH_DVLOG_IF(verbose_level, condition, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err) \
-                DVLOG_IS_ON(verbose_level) && (condition))
+    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
+                MACH_DVLOG_IS_ON(verbose_level) && (condition))
 
 #define MACH_DCHECK(condition, mach_err) \
     LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), \
                 DCHECK_IS_ON && !(condition)) \
     << "Check failed: " # condition << ". "
 
+#define BOOTSTRAP_DVLOG_IS_ON MACH_DVLOG_IS_ON
+
 #define BOOTSTRAP_LOG_STREAM(severity, bootstrap_err) \
     COMPACT_GOOGLE_LOG_EX_ ## severity(BootstrapLogMessage, \
                                        bootstrap_err).stream()
 #define BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \
     logging::BootstrapLogMessage(__FILE__, __LINE__, \
                                  -verbose_level, bootstrap_err).stream()
 
 #define BOOTSTRAP_LOG(severity, bootstrap_err) \
     LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, \
                                      bootstrap_err), LOG_IS_ON(severity))
@@ skipping 14 matching lines @@
 
 #define BOOTSTRAP_DLOG(severity, bootstrap_err) \
     LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
                 DLOG_IS_ON(severity))
 #define BOOTSTRAP_DLOG_IF(severity, condition, bootstrap_err) \
     LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
                 DLOG_IS_ON(severity) && (condition))
 
 #define BOOTSTRAP_DVLOG(verbose_level, bootstrap_err) \
     LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                DVLOG_IS_ON(verbose_level))
+                BOOTSTRAP_DVLOG_IS_ON(verbose_level))
 #define BOOTSTRAP_DVLOG_IF(verbose_level, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \
-                DVLOG_IS_ON(verbose_level) && (condition))
+    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
+                BOOTSTRAP_DVLOG_IS_ON(verbose_level) && (condition))
 
 #define BOOTSTRAP_DCHECK(condition, bootstrap_err) \
     LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), \
                 DCHECK_IS_ON && !(condition)) \
     << "Check failed: " # condition << ". "
 
 #endif  // BASE_MAC_MACH_LOGGING_H_