Back out r269483 and the line of fixes that followed it.

base/mac/mac_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_MAC_MAC_LOGGING_H_
 #define BASE_MAC_MAC_LOGGING_H_
 
-#include "base/base_export.h"
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 
 #if defined(OS_IOS)
 #include <MacTypes.h>
 #else
 #include <libkern/OSTypes.h>
 #endif
 
 // Use the OSSTATUS_LOG family to log messages related to errors in Mac OS X
@@ skipping 18 matching lines @@
   ~OSStatusLogMessage();
 
  private:
   OSStatus status_;
 
   DISALLOW_COPY_AND_ASSIGN(OSStatusLogMessage);
 };
 
 }  // namespace logging
 
-#if defined(NDEBUG)
-#define MAC_DVLOG_IS_ON(verbose_level) 0
-#else
-#define MAC_DVLOG_IS_ON(verbose_level) VLOG_IS_ON(verbose_level)
-#endif
-
 #define OSSTATUS_LOG_STREAM(severity, status) \
     COMPACT_GOOGLE_LOG_EX_ ## severity(OSStatusLogMessage, status).stream()
 #define OSSTATUS_VLOG_STREAM(verbose_level, status) \
     logging::OSStatusLogMessage(__FILE__, __LINE__, \
                                 -verbose_level, status).stream()
 
 #define OSSTATUS_LOG(severity, status) \
     LAZY_STREAM(OSSTATUS_LOG_STREAM(severity, status), LOG_IS_ON(severity))
 #define OSSTATUS_LOG_IF(severity, condition, status) \
     LAZY_STREAM(OSSTATUS_LOG_STREAM(severity, status), \
@@ skipping 11 matching lines @@
     << "Check failed: " # condition << ". "
 
 #define OSSTATUS_DLOG(severity, status) \
     LAZY_STREAM(OSSTATUS_LOG_STREAM(severity, status), DLOG_IS_ON(severity))
 #define OSSTATUS_DLOG_IF(severity, condition, status) \
     LAZY_STREAM(OSSTATUS_LOG_STREAM(severity, status), \
                 DLOG_IS_ON(severity) && (condition))
 
 #define OSSTATUS_DVLOG(verbose_level, status) \
     LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status), \
-                MAC_DVLOG_IS_ON(verbose_level))
+                DVLOG_IS_ON(verbose_level))
 #define OSSTATUS_DVLOG_IF(verbose_level, condition, status) \
-    LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status), \
-                MAC_DVLOG_IS_ON(verbose_level) && (condition))
+    LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status) \
+                DVLOG_IS_ON(verbose_level) && (condition))
 
 #define OSSTATUS_DCHECK(condition, status) \
     LAZY_STREAM(OSSTATUS_LOG_STREAM(FATAL, status), \
                 DCHECK_IS_ON && !(condition)) \
     << "Check failed: " # condition << ". "
 
 #endif  // BASE_MAC_MAC_LOGGING_H_