Report CHECK/DCHECK to test launcher summary output.

base/logging.cc

Index: base/logging.cc
diff --git a/base/logging.cc b/base/logging.cc
index cea6edae4a37cef2519ff32045c46c0a3c73e4d0..748e3f45f926420dc29a9579209ccd2f7d1732f6 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -7,6 +7,7 @@
 #include <limits.h>
 #include <stdint.h>
 
+#include "base/callback.h"
 #include "base/debug/activity_tracker.h"
 #include "base/macros.h"
 #include "build/build_config.h"
@@ -121,8 +122,15 @@ bool g_log_tickcount = false;
 bool show_error_dialogs = false;
 
 // An assert handler override specified by the client to be called instead of
-// the debug message dialog and process termination.
-LogAssertHandlerFunction log_assert_handler = nullptr;
+// the debug message dialog and process termination. Assert handlers are stored
+// in stack to allow overriding and restoring.
+struct LogAssertHandlerStackItem {
+  LogAssertHandlerStackItem* next;
+  LogAssertHandlerFunction handler;
+};

[dcheng, 2017/02/14 23:59:26]

Perhaps just use something from STL here? We can just leak it, but we shouldn't
be writing manual new / delete cleanup code.

My other concern is that because we have a manual push, it's possible to get
unpaired push and pops. Is there any way that we can make the logging handler
always scoped?

[alex-ac, 2017/03/09 14:15:53]

We can't use non-pod type for a global variable. It will not be destructed. So
we have to use new/delete here.

I found unpaired push/pop calls in the chrome/common/logging_chrome.cc, It's
used from the chromeos code to suppress default assert handler until end of the
process lifetime.

[dcheng, 2017/03/09 19:41:02]

It could just be a vector in a LazyInstance/function-local static.

I'd be OK with exposing a push-only API for the CrOS case.

+
+LogAssertHandlerStackItem* log_assert_handler_stack = nullptr;
+
 // A log message handler that gets notified of every log message we process.
 LogMessageHandlerFunction log_message_handler = nullptr;
 
@@ -444,8 +452,25 @@ void SetShowErrorDialogs(bool enable_dialogs) {
   show_error_dialogs = enable_dialogs;
 }
 
-void SetLogAssertHandler(LogAssertHandlerFunction handler) {
-  log_assert_handler = handler;
+void PushLogAssertHandler(LogAssertHandlerFunction handler) {
+  LogAssertHandlerStackItem* stack_item = new LogAssertHandlerStackItem;
+  stack_item->handler = handler;
+  stack_item->next = log_assert_handler_stack;
+  log_assert_handler_stack = stack_item;
+}
+
+void PopLogAssertHandler() {
+  LogAssertHandlerStackItem* stack_item = log_assert_handler_stack;
+  if (stack_item) {
+    log_assert_handler_stack = stack_item->next;
+    delete stack_item;
+  }
+}
+
+LogAssertHandlerFunction GetLogAssertHandler() {
+  if (log_assert_handler_stack)
+    return log_assert_handler_stack->handler;
+  return LogAssertHandlerFunction();
 }
 
 void SetLogMessageHandler(LogMessageHandlerFunction handler) {
@@ -531,6 +556,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
 }
 
 LogMessage::~LogMessage() {
+  size_t stack_start = stream_.str().length();
 #if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__)
   if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
     // Include a stack trace on a fatal, unless a debugger is attached.
@@ -739,9 +765,13 @@ LogMessage::~LogMessage() {
     str_newline.copy(str_stack, arraysize(str_stack));
     base::debug::Alias(str_stack);
 
+    LogAssertHandlerFunction log_assert_handler = GetLogAssertHandler();
     if (log_assert_handler) {
-      // Make a copy of the string for the handler out of paranoia.
-      log_assert_handler(std::string(stream_.str()));
+      const std::string& full_message = stream_.str();
+      log_assert_handler.Run(
+          file_, line_,
+          full_message.substr(message_start_, stack_start - message_start_),
+          full_message.substr(stack_start));
     } else {
       // Don't use the string with the newline, get a fresh version to send to
       // the debug message process. We also don't display assertions to the