diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 21:15:33 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 21:15:33 +0000 |
| commit | 5e3f7c2124c2ebf1b83effac1eb843d905112cc9 (patch) | |
| tree | e5118c79feba3baaf5081e9ed349e104aff36986 /jingle/glue | |
| parent | f25eb36e3344223ffcabcf96d54cf000862d6088 (diff) | |
| download | chromium_src-5e3f7c2124c2ebf1b83effac1eb843d905112cc9.zip chromium_src-5e3f7c2124c2ebf1b83effac1eb843d905112cc9.tar.gz chromium_src-5e3f7c2124c2ebf1b83effac1eb843d905112cc9.tar.bz2 | |
Define a LoggingSettings struct to use for InitLogging()
Update all callers of InitLogging() to use LoggingSettings, only
setting fields that need a non-default value.
Turn LoggingDestination enum into a bit field and define add
LOG_DEFAULT and LOG_ALL constants.
Fix erroneous comment saying that the default was to not lock
the log file.
BUG=247594
TBR=brettw@chromium.org, cpu@chromium.org, gene@chromium.org, jam@chromium.org, rch@chromium.org, scherkus@chromium.org, sergeyu@chromium.org, sky@chromium.org, tkent@chromium.org, yfriedman@chromium.org, zea@chromium.org
Review URL: https://codereview.chromium.org/16519003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue')
| -rw-r--r-- | jingle/glue/logging_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/jingle/glue/logging_unittest.cc b/jingle/glue/logging_unittest.cc index a9f0d8e..85ac558 100644 --- a/jingle/glue/logging_unittest.cc +++ b/jingle/glue/logging_unittest.cc @@ -58,9 +58,12 @@ static bool Initialize(int verbosity_level) { } // The command line flags are parsed here and the log file name is set. - if (!InitLogging(log_file_name, logging::LOG_ONLY_TO_FILE, - logging::DONT_LOCK_LOG_FILE, logging::DELETE_OLD_LOG_FILE, - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS)) { + logging::LoggingSettings settings; + settings.logging_dest = logging::LOG_TO_FILE; + settings.log_file = log_file_name; + settings.lock_log = logging::DONT_LOCK_LOG_FILE; + settings.delete_old = logging::DELETE_OLD_LOG_FILE; + if (!logging::InitLogging(settings)) { return false; } EXPECT_TRUE(VLOG_IS_ON(verbosity_level)); |