Revert of Patch to try dump-on-DCHECK.

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 619 matching lines @@
   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))
 
 // Definitions for DCHECK et al.
 
 #if DCHECK_IS_ON()
 
-// If DCHECK is configured to dump-without-crashing then omit these, so that
-// anything using them directly will break the build. See crbug.com/596231.
-#if !defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-
 #define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
   COMPACT_GOOGLE_LOG_EX_FATAL(ClassName , ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_FATAL
 const LogSeverity LOG_DCHECK = LOG_FATAL;
 
-#endif  // !defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-
 #else  // DCHECK_IS_ON()
 
 // These are just dummy values.
 #define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
   COMPACT_GOOGLE_LOG_EX_INFO(ClassName , ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_INFO
 const LogSeverity LOG_DCHECK = LOG_INFO;
 
 #endif  // DCHECK_IS_ON()
 
 // DCHECK et al. make sure to reference |condition| regardless of
 // whether DCHECKs are enabled; this is so that we don't get unused
 // variable warnings if the only use of a variable is in a DCHECK.
 // This behavior is different from DLOG_IF et al.
 
 #if defined(_PREFAST_) && defined(OS_WIN)
 // See comments on the previous use of __analysis_assume.
 
-#if defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-#error "Only one of _PREFAST_ and DCHECK_IS_DUMP_WITHOUT_CRASH may be set"
-#endif  // defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-
 #define DCHECK(condition)                                               \
   __analysis_assume(!!(condition)),                                     \
   LAZY_STREAM(LOG_STREAM(DCHECK), false)                                \
   << "Check failed: " #condition ". "
 
 #define DPCHECK(condition)                                              \
   __analysis_assume(!!(condition)),                                     \
   LAZY_STREAM(PLOG_STREAM(DCHECK), false)                               \
   << "Check failed: " #condition ". "
 
-#elif DCHECK_IS_ON() && defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-// DCHECK is configured to dump-without-crashing, rather than logging.
-// See crbug.com/596231.
-
-BASE_EXPORT void DCheckDumpWithoutCrashing();
-
-#define DCHECK(condition)                                       \
-  (condition) ? (void)0 : logging::DCheckDumpWithoutCrashing(), \
-      EAT_STREAM_PARAMETERS
-
-// Since we're uploading a crash dump, not logging, DPCHECK behaves identically.
-#define DPCHECK(condition) DCHECK(condition)
-
-#else  // DCHECK_IS_ON() && defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
+#else  // _PREFAST_
 
 #define DCHECK(condition)                                                \
   LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() ? !(condition) : false) \
       << "Check failed: " #condition ". "
 
 #define DPCHECK(condition)                                                \
   LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() ? !(condition) : false) \
       << "Check failed: " #condition ". "
 
-#endif  // DCHECK_IS_ON() && defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
+#endif  // _PREFAST_
 
 // Helper macro for binary operators.
 // Don't use this macro directly in your code, use DCHECK_EQ et al below.
-
-#if DCHECK_IS_ON() && defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-// DCHECK is configured to dump-without-crashing, rather than logging.
-// See crbug.com/596231.
-
-// Use logging::Check*Impl() to ensure that operator<<()s don't go unused.
-#define DCHECK_OP(name, op, val1, val2) \
-  DCHECK(logging::Check##name##Impl((val1), (val2), #val1 " " #op " " #val2))
-
-#else  // DCHECK_IS_ON() && defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-
 // The 'switch' is used to prevent the 'else' from being ambiguous when the
 // macro is used in an 'if' clause such as:
 // if (a == 1)
 //   DCHECK_EQ(2, a);
 #define DCHECK_OP(name, op, val1, val2)                               \
   switch (0) case 0: default:                                         \
   if (logging::CheckOpResult true_if_passed =                         \
       DCHECK_IS_ON() ?                                                \
       logging::Check##name##Impl((val1), (val2),                      \
                                  #val1 " " #op " " #val2) : nullptr)  \
    ;                                                                  \
   else                                                                \
     logging::LogMessage(__FILE__, __LINE__, ::logging::LOG_DCHECK,    \
                         true_if_passed.message()).stream()
 
-#endif  // DCHECK_IS_ON() && defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
-
 // Equality/Inequality checks - compare two values, and log a
 // LOG_DCHECK message including the two values when the result is not
 // as expected.  The values must have operator<<(ostream, ...)
 // defined.
 //
 // You may append to the error message like so:
 //   DCHECK_NE(1, 2) << ": The world must be ending!";
 //
 // We are very careful to ensure that each argument is evaluated exactly
 // once, and that anything which is legal to pass as a function argument is
@@ skipping 244 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_