Report CHECK/DCHECK to test launcher summary output.

net/test/scoped_disable_exit_on_dfatal.cc

Index: net/test/scoped_disable_exit_on_dfatal.cc
diff --git a/net/test/scoped_disable_exit_on_dfatal.cc b/net/test/scoped_disable_exit_on_dfatal.cc
index f9091261bc56464288820ade1caeb3b90d0bad73..6b5ca68deba8c1bde7157a079ed640aab2f50ded 100644
--- a/net/test/scoped_disable_exit_on_dfatal.cc
+++ b/net/test/scoped_disable_exit_on_dfatal.cc
@@ -4,28 +4,23 @@
 
 #include "net/test/scoped_disable_exit_on_dfatal.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
 
 namespace net {
 namespace test {
 
-// static
-ScopedDisableExitOnDFatal* ScopedDisableExitOnDFatal::g_instance_ = NULL;
-
-ScopedDisableExitOnDFatal::ScopedDisableExitOnDFatal() {
-  CHECK(!g_instance_);
-  g_instance_ = this;
-  logging::SetLogAssertHandler(LogAssertHandler);
-}
+ScopedDisableExitOnDFatal::ScopedDisableExitOnDFatal()
+    : ScopedLogAssertHandler(base::Bind(LogAssertHandler)) {}
 
-ScopedDisableExitOnDFatal::~ScopedDisableExitOnDFatal() {
-  CHECK_EQ(g_instance_, this);
-  logging::SetLogAssertHandler(NULL);
-  g_instance_ = NULL;
-}
+ScopedDisableExitOnDFatal::~ScopedDisableExitOnDFatal() {}
 
 // static
-void ScopedDisableExitOnDFatal::LogAssertHandler(const std::string& str) {
+void ScopedDisableExitOnDFatal::LogAssertHandler(const char* file,
+                                                 int line,
+                                                 size_t message_start,
+                                                 size_t stack_start,
+                                                 const std::string& str) {
   // Simply swallow the assert.
 }