diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 01:03:36 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 01:03:36 +0000 |
| commit | 7c10f7553bf4da999f954e501fc2908e10dd3bcf (patch) | |
| tree | 09ea21b6c28bc9132d0a2f4b678cc810a29e3fd1 /base/logging_unittest.cc | |
| parent | 9a425422549b0dc33730e85bdae2fd441caa55da (diff) | |
| download | chromium_src-7c10f7553bf4da999f954e501fc2908e10dd3bcf.zip chromium_src-7c10f7553bf4da999f954e501fc2908e10dd3bcf.tar.gz chromium_src-7c10f7553bf4da999f954e501fc2908e10dd3bcf.tar.bz2 | |
Made logging not look up --enable-dcheck from command line
Made --enable-dcheck a parameter to InitLogging() and fixed up all
callsites.
BUG=62736
TEST=Manual
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70782
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70920
Review URL: http://codereview.chromium.org/6070006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging_unittest.cc')
| -rw-r--r-- | base/logging_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/logging_unittest.cc b/base/logging_unittest.cc index 4b7fdbc..bb6e3d1 100644 --- a/base/logging_unittest.cc +++ b/base/logging_unittest.cc @@ -197,7 +197,7 @@ TEST_F(LoggingTest, DcheckStreamsAreLazy) { #if !defined(LOGGING_IS_OFFICIAL_BUILD) && defined(NDEBUG) // Unofficial release build. - logging::g_enable_dcheck = false; + g_dcheck_state = DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; DCHECK(mock_log_source.Log()) << mock_log_source.Log(); DPCHECK(mock_log_source.Log()) << mock_log_source.Log(); DCHECK_EQ(0, 0) << mock_log_source.Log(); @@ -213,13 +213,13 @@ TEST_F(LoggingTest, Dcheck) { EXPECT_FALSE(DLOG_IS_ON(DCHECK)); #elif defined(NDEBUG) // Unofficial release build. - logging::g_enable_dcheck = true; - logging::SetLogReportHandler(&LogSink); + g_dcheck_state = ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; + SetLogReportHandler(&LogSink); EXPECT_TRUE(DCHECK_IS_ON()); EXPECT_FALSE(DLOG_IS_ON(DCHECK)); #else // Unofficial debug build. - logging::SetLogAssertHandler(&LogSink); + SetLogAssertHandler(&LogSink); EXPECT_TRUE(DCHECK_IS_ON()); EXPECT_TRUE(DLOG_IS_ON(DCHECK)); #endif // defined(LOGGING_IS_OFFICIAL_BUILD) |