Reverting 20497.

base/logging.h

 // Copyright (c) 2006-2008 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 <string>
 #include <cstring>
 #include <sstream>
@@ skipping 262 matching lines @@
 
 // Plus some debug-logging macros that get compiled to nothing for production
 //
 // DEBUG_MODE is for uses like
 //   if (DEBUG_MODE) foo.CheckThatFoo();
 // instead of
 //   #ifndef NDEBUG
 //     foo.CheckThatFoo();
 //   #endif
 
-// http://crbug.com/16512 is open for a real fix for this.  For now, Windows
-// uses OFFICIAL_BUILD and !Windows uses the branding flag when NDEBUG is
-// defined.
-#if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
-    (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
+#ifdef OFFICIAL_BUILD
 // We want to have optimized code for an official build so we remove DLOGS and
 // DCHECK from the executable.
 
 #define DLOG(severity) \
   true ? (void) 0 : logging::LogMessageVoidify() & LOG(severity)
 
 #define DLOG_IF(severity, condition) \
   true ? (void) 0 : logging::LogMessageVoidify() & LOG(severity)
 
 #define DLOG_ASSERT(condition) \
@@ skipping 348 matching lines @@
 #elif NOTIMPLEMENTED_POLICY == 4
 #define NOTIMPLEMENTED() LOG(ERROR) << NOTIMPLEMENTED_MSG
 #elif NOTIMPLEMENTED_POLICY == 5
 #define NOTIMPLEMENTED() do {\
   static int count = 0;\
   LOG_IF(ERROR, 0 == count++) << NOTIMPLEMENTED_MSG;\
 } while(0)
 #endif
 
 #endif  // BASE_LOGGING_H_