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

base/logging_unittest.cc

Index: base/logging_unittest.cc
diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc
index 6ae965f7f0ff2436e57dbd4c018419f2a508d527..62323972b8a12c4ac7fa6061eeb5812b294eb4e1 100644
--- a/base/logging_unittest.cc
+++ b/base/logging_unittest.cc
@@ -2,12 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/strings/string_piece.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -32,16 +29,12 @@
 namespace {
 
 using ::testing::Return;
-using ::testing::_;
 
 // Needs to be global since log assert handlers can't maintain state.
 int log_sink_call_count = 0;
 
 #if !defined(OFFICIAL_BUILD) || defined(DCHECK_ALWAYS_ON) || !defined(NDEBUG)
-void LogSink(const char* file,
-             int line,
-             const base::StringPiece message,
-             const base::StringPiece stack_trace) {
+void LogSink(const std::string& str) {
   ++log_sink_call_count;
 }
 #endif
@@ -54,6 +47,7 @@
 
   ~LogStateSaver() {
     SetMinLogLevel(old_min_log_level_);
+    SetLogAssertHandler(NULL);
     log_sink_call_count = 0;
   }
 
@@ -71,13 +65,6 @@
 class MockLogSource {
  public:
   MOCK_METHOD0(Log, const char*());
-};
-
-class MockLogAssertHandler {
- public:
-  MOCK_METHOD4(
-      HandleLogAssert,
-      void(const char*, int, const base::StringPiece, const base::StringPiece));
 };
 
 TEST_F(LoggingTest, BasicLogging) {
@@ -210,7 +197,7 @@
       WillRepeatedly(Return("check message"));
   EXPECT_CALL(uncalled_mock_log_source, Log()).Times(0);
 
-  ScopedLogAssertHandler scoped_assert_handler(base::Bind(LogSink));
+  SetLogAssertHandler(&LogSink);
 
   CHECK(mock_log_source.Log()) << uncalled_mock_log_source.Log();
   PCHECK(!mock_log_source.Log()) << mock_log_source.Log();
@@ -418,12 +405,12 @@
   EXPECT_FALSE(DLOG_IS_ON(DCHECK));
 #elif defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
   // Release build with real DCHECKS.
-  ScopedLogAssertHandler scoped_assert_handler(base::Bind(LogSink));
+  SetLogAssertHandler(&LogSink);
   EXPECT_TRUE(DCHECK_IS_ON());
   EXPECT_TRUE(DLOG_IS_ON(DCHECK));
 #else
   // Debug build.
-  ScopedLogAssertHandler scoped_assert_handler(base::Bind(LogSink));
+  SetLogAssertHandler(&LogSink);
   EXPECT_TRUE(DCHECK_IS_ON());
   EXPECT_TRUE(DLOG_IS_ON(DCHECK));
 #endif
@@ -512,44 +499,6 @@
     CHECK_EQ(false, true);           // Unreached.
 }
 
-TEST_F(LoggingTest, NestedLogAssertHandlers) {
-  ::testing::InSequence dummy;
-  ::testing::StrictMock<MockLogAssertHandler> handler_a, handler_b;
-
-  EXPECT_CALL(
-      handler_a,
-      HandleLogAssert(
-          _, _,
-          base::StringPiece(
-              "Check failed: false. First assert must be catched by handler_a"),
-          _));
-  EXPECT_CALL(
-      handler_b,
-      HandleLogAssert(_, _,
-                      base::StringPiece("Check failed: false. Second assert "
-                                        "must be catched by handler_b"),
-                      _));
-  EXPECT_CALL(
-      handler_a,
-      HandleLogAssert(_, _,
-                      base::StringPiece("Check failed: false. Last assert "
-                                        "must be catched by handler_a again"),
-                      _));
-
-  logging::ScopedLogAssertHandler scoped_handler_a(base::Bind(
-      &MockLogAssertHandler::HandleLogAssert, base::Unretained(&handler_a)));
-
-  CHECK(false) << "First assert must be catched by handler_a";
-
-  {
-    logging::ScopedLogAssertHandler scoped_handler_b(base::Bind(
-        &MockLogAssertHandler::HandleLogAssert, base::Unretained(&handler_b)));
-    CHECK(false) << "Second assert must be catched by handler_b";
-  }
-
-  CHECK(false) << "Last assert must be catched by handler_a again";
-}
-
 // Test that defining an operator<< for a type in a namespace doesn't prevent
 // other code in that namespace from calling the operator<<(ostream, wstring)
 // defined by logging.h. This can fail if operator<<(ostream, wstring) can't be