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

base/logging_unittest.cc

 // Copyright (c) 2011 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 "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"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <unistd.h>
 #include "base/posix/eintr_wrapper.h"
 #endif  // OS_POSIX
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
 #include <ucontext.h>
 #endif
 
 #if defined(OS_WIN)
 #include <excpt.h>
 #include <windows.h>
 #endif  // OS_WIN
 
 namespace logging {
 
 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
 
 // Class to make sure any manipulations we do to the min log level are
 // contained (i.e., do not affect other unit tests).
 class LogStateSaver {
  public:
   LogStateSaver() : old_min_log_level_(GetMinLogLevel()) {}
 
   ~LogStateSaver() {
     SetMinLogLevel(old_min_log_level_);
+    SetLogAssertHandler(NULL);
     log_sink_call_count = 0;
   }
 
  private:
   int old_min_log_level_;
 
   DISALLOW_COPY_AND_ASSIGN(LogStateSaver);
 };
 
 class LoggingTest : public testing::Test {
  private:
   LogStateSaver log_state_saver_;
 };
 
 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) {
   MockLogSource mock_log_source;
   EXPECT_CALL(mock_log_source, Log())
       .Times(DCHECK_IS_ON() ? 16 : 8)
       .WillRepeatedly(Return("log message"));
 
   SetMinLogLevel(LOG_INFO);
 
   EXPECT_TRUE(LOG_IS_ON(INFO));
   EXPECT_TRUE((DCHECK_IS_ON() != 0) == DLOG_IS_ON(INFO));
@@ skipping 110 matching lines @@
 #define MAYBE_CheckStreamsAreLazy DISABLED_CheckStreamsAreLazy
 #else
 #define MAYBE_CheckStreamsAreLazy CheckStreamsAreLazy
 #endif
 TEST_F(LoggingTest, MAYBE_CheckStreamsAreLazy) {
   MockLogSource mock_log_source, uncalled_mock_log_source;
   EXPECT_CALL(mock_log_source, Log()).Times(8).
       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();
   CHECK_EQ(mock_log_source.Log(), mock_log_source.Log())
       << uncalled_mock_log_source.Log();
   CHECK_NE(mock_log_source.Log(), mock_log_source.Log())
       << mock_log_source.Log();
 }
 
 #endif
@@ skipping 187 matching lines @@
 #else
 #define MAYBE_Dcheck Dcheck
 #endif
 TEST_F(LoggingTest, MAYBE_Dcheck) {
 #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
   // Release build.
   EXPECT_FALSE(DCHECK_IS_ON());
   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
 
   EXPECT_EQ(0, log_sink_call_count);
   DCHECK(false);
   EXPECT_EQ(DCHECK_IS_ON() ? 1 : 0, log_sink_call_count);
   DPCHECK(false);
   EXPECT_EQ(DCHECK_IS_ON() ? 2 : 0, log_sink_call_count);
   DCHECK_EQ(0, 1);
@@ skipping 68 matching lines @@
   if (false)
     CHECK_EQ(false, true);           // Unreached.
   else
     CHECK_EQ(true, reached = true);  // Reached, passed.
   ASSERT_TRUE(reached);
 
   if (false)
     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
 // found by ADL, since defining another operator<< prevents name lookup from
 // looking in the global namespace.
 namespace nested_test {
   class Streamable {};
   ALLOW_UNUSED_TYPE std::ostream& operator<<(std::ostream& out,
                                              const Streamable&) {
     return out << "Streamable";
   }
   TEST_F(LoggingTest, StreamingWstringFindsCorrectOperator) {
     std::wstring wstr = L"Hello World";
     std::ostringstream ostr;
     ostr << wstr;
     EXPECT_EQ("Hello World", ostr.str());
   }
 }  // namespace nested_test
 
 }  // namespace
 
 }  // namespace logging