| Index: base/logging_unittest.cc
|
| diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc
|
| index 44a1be3d71e57c90497bdf30a8674a72a01af0e5..f823d6ee2d7814a089f930ffb2f130ed48e2b514 100644
|
| --- a/base/logging_unittest.cc
|
| +++ b/base/logging_unittest.cc
|
| @@ -32,7 +32,6 @@ class LogStateSaver {
|
| ~LogStateSaver() {
|
| SetMinLogLevel(old_min_log_level_);
|
| SetLogAssertHandler(NULL);
|
| - SetLogReportHandler(NULL);
|
| log_sink_call_count = 0;
|
| }
|
|
|
| @@ -96,7 +95,6 @@ TEST_F(LoggingTest, LogIsOn) {
|
| EXPECT_TRUE(LOG_IS_ON(INFO));
|
| EXPECT_TRUE(LOG_IS_ON(WARNING));
|
| EXPECT_TRUE(LOG_IS_ON(ERROR));
|
| - EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
|
| EXPECT_TRUE(LOG_IS_ON(FATAL));
|
| EXPECT_TRUE(LOG_IS_ON(DFATAL));
|
|
|
| @@ -104,7 +102,6 @@ TEST_F(LoggingTest, LogIsOn) {
|
| EXPECT_FALSE(LOG_IS_ON(INFO));
|
| EXPECT_TRUE(LOG_IS_ON(WARNING));
|
| EXPECT_TRUE(LOG_IS_ON(ERROR));
|
| - EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
|
| EXPECT_TRUE(LOG_IS_ON(FATAL));
|
| EXPECT_TRUE(LOG_IS_ON(DFATAL));
|
|
|
| @@ -112,33 +109,14 @@ TEST_F(LoggingTest, LogIsOn) {
|
| EXPECT_FALSE(LOG_IS_ON(INFO));
|
| EXPECT_FALSE(LOG_IS_ON(WARNING));
|
| EXPECT_TRUE(LOG_IS_ON(ERROR));
|
| - EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
|
| EXPECT_TRUE(LOG_IS_ON(FATAL));
|
| EXPECT_TRUE(LOG_IS_ON(DFATAL));
|
|
|
| - SetMinLogLevel(LOG_ERROR_REPORT);
|
| - EXPECT_FALSE(LOG_IS_ON(INFO));
|
| - EXPECT_FALSE(LOG_IS_ON(WARNING));
|
| - EXPECT_FALSE(LOG_IS_ON(ERROR));
|
| - EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
|
| - EXPECT_TRUE(LOG_IS_ON(FATAL));
|
| - EXPECT_TRUE(kDfatalIsFatal == LOG_IS_ON(DFATAL));
|
| -
|
| - // LOG_IS_ON(ERROR_REPORT) should always be true.
|
| - SetMinLogLevel(LOG_FATAL);
|
| - EXPECT_FALSE(LOG_IS_ON(INFO));
|
| - EXPECT_FALSE(LOG_IS_ON(WARNING));
|
| - EXPECT_FALSE(LOG_IS_ON(ERROR));
|
| - EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
|
| - EXPECT_TRUE(LOG_IS_ON(FATAL));
|
| - EXPECT_TRUE(kDfatalIsFatal == LOG_IS_ON(DFATAL));
|
| -
|
| - // So should LOG_IS_ON(FATAL).
|
| + // LOG_IS_ON(FATAL) should always be true.
|
| SetMinLogLevel(LOG_FATAL + 1);
|
| EXPECT_FALSE(LOG_IS_ON(INFO));
|
| EXPECT_FALSE(LOG_IS_ON(WARNING));
|
| EXPECT_FALSE(LOG_IS_ON(ERROR));
|
| - EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
|
| EXPECT_TRUE(LOG_IS_ON(FATAL));
|
| EXPECT_TRUE(kDfatalIsFatal == LOG_IS_ON(DFATAL));
|
| }
|
|
|