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

net/test/scoped_disable_exit_on_dfatal.cc

 // Copyright 2014 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 "net/test/scoped_disable_exit_on_dfatal.h"
 
-#include "base/bind.h"
 #include "base/logging.h"
-#include "base/strings/string_piece.h"
 
 namespace net {
 namespace test {
 
-ScopedDisableExitOnDFatal::ScopedDisableExitOnDFatal()
-    : assert_handler_(base::Bind(LogAssertHandler)) {}
+// static
+ScopedDisableExitOnDFatal* ScopedDisableExitOnDFatal::g_instance_ = NULL;
 
-ScopedDisableExitOnDFatal::~ScopedDisableExitOnDFatal() {}
+ScopedDisableExitOnDFatal::ScopedDisableExitOnDFatal() {
+  CHECK(!g_instance_);
+  g_instance_ = this;
+  logging::SetLogAssertHandler(LogAssertHandler);
+}
+
+ScopedDisableExitOnDFatal::~ScopedDisableExitOnDFatal() {
+  CHECK_EQ(g_instance_, this);
+  logging::SetLogAssertHandler(NULL);
+  g_instance_ = NULL;
+}
 
 // static
-void ScopedDisableExitOnDFatal::LogAssertHandler(
-    const char* file,
-    int line,
-    const base::StringPiece message,
-    const base::StringPiece stack_trace) {
+void ScopedDisableExitOnDFatal::LogAssertHandler(const std::string& str) {
   // Simply swallow the assert.
 }
 
 }  // namespace test
 }  // namespace net