Revert of Report CHECK/DCHECK to test launcher summary output.

chrome/common/logging_chrome.cc

 // 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.
 
 #include "build/build_config.h"
 
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the
 // ViewMsgLog et al. functions.
@@ skipping 51 matching lines @@
 #include <initguid.h>
 #include "base/logging_win.h"
 #include "base/syslog_logging.h"
 #include "chrome/install_static/install_details.h"
 #endif
 
 namespace {
 
 // When true, this means that error dialogs should not be shown.
 bool dialogs_are_suppressed_ = false;
-logging::ScopedLogAssertHandler* assert_handler_ = nullptr;
 
 // This should be true for exactly the period between the end of
 // InitChromeLogging() and the beginning of CleanupChromeLogging().
 bool chrome_logging_initialized_ = false;
 
 // Set if we called InitChromeLogging() but failed to initialize.
 bool chrome_logging_failed_ = false;
 
 // This should be true for exactly the period between the end of
 // InitChromeLogging() and the beginning of CleanupChromeLogging().
 bool chrome_logging_redirected_ = false;
 
 #if defined(OS_WIN)
 // {7FE69228-633E-4f06-80C1-527FEA23E3A7}
 const GUID kChromeTraceProviderName = {
     0x7fe69228, 0x633e, 0x4f06,
         { 0x80, 0xc1, 0x52, 0x7f, 0xea, 0x23, 0xe3, 0xa7 } };
 #endif
 
 // Assertion handler for logging errors that occur when dialogs are
 // silenced.  To record a new error, pass the log string associated
 // with that error in the str parameter.
 MSVC_DISABLE_OPTIMIZE();
-void SilentRuntimeAssertHandler(const char* file,
-                                int line,
-                                const base::StringPiece message,
-                                const base::StringPiece stack_trace) {
+void SilentRuntimeAssertHandler(const std::string& str) {
   base::debug::BreakDebugger();
 }
 MSVC_ENABLE_OPTIMIZE();
 
 // Suppresses error/assertion dialogs and enables the logging of
 // those errors into silenced_errors_.
 void SuppressDialogs() {
   if (dialogs_are_suppressed_)
     return;
 
-  assert_handler_ = new logging::ScopedLogAssertHandler(
-      base::Bind(SilentRuntimeAssertHandler));
+  logging::SetLogAssertHandler(SilentRuntimeAssertHandler);
 
 #if defined(OS_WIN)
   UINT new_flags = SEM_FAILCRITICALERRORS |
                    SEM_NOGPFAULTERRORBOX |
                    SEM_NOOPENFILEERRORBOX;
 
   // Preserve existing error mode, as discussed at http://t/dmea
   UINT existing_flags = SetErrorMode(new_flags);
   SetErrorMode(existing_flags | new_flags);
 #endif
@@ skipping 299 matching lines @@
                                           time_deets.year,
                                           time_deets.month,
                                           time_deets.day_of_month,
                                           time_deets.hour,
                                           time_deets.minute,
                                           time_deets.second);
   return base_path.InsertBeforeExtensionASCII(suffix);
 }
 
 }  // namespace logging