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

7 files changed, 31 insertions, 43 deletions

diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc
index 65eb01a..0da9845 100644
--- a/net/disk_cache/stress_cache.cc
+++ b/net/disk_cache/stress_cache.cc
@@ -270,9 +270,9 @@ int main(int argc, const char* argv[]) {
   logging::LogEventProvider::Initialize(kStressCacheTraceProviderName);
 #else
   CommandLine::Init(argc, argv);
-  logging::InitLogging(NULL, logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
-                       logging::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_SYSTEM_DEBUG_LOG;
+  logging::InitLogging(settings);
 #endif
 
   // Some time for the memory manager to flush stuff.
diff --git a/net/tools/flip_server/flip_config.cc b/net/tools/flip_server/flip_config.cc
index 8d78924..eb5c3ca 100644
--- a/net/tools/flip_server/flip_config.cc
+++ b/net/tools/flip_server/flip_config.cc
@@ -97,7 +97,7 @@ FlipAcceptor::~FlipAcceptor() {}
 
 FlipConfig::FlipConfig()
     : server_think_time_in_s_(0),
-      log_destination_(logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG),
+      log_destination_(logging::LOG_TO_SYSTEM_DEBUG_LOG),
       wait_for_iface_(false) {
 }
 
diff --git a/net/tools/flip_server/flip_in_mem_edsm_server.cc b/net/tools/flip_server/flip_in_mem_edsm_server.cc
index 15fb9644..e6c32aa 100644
--- a/net/tools/flip_server/flip_in_mem_edsm_server.cc
+++ b/net/tools/flip_server/flip_in_mem_edsm_server.cc
@@ -227,12 +227,11 @@ int main (int argc, char**argv)
   if (cl.HasSwitch("logdest")) {
     std::string log_dest_value = cl.GetSwitchValueASCII("logdest");
     if (log_dest_value.compare("file") == 0) {
-      g_proxy_config.log_destination_ = logging::LOG_ONLY_TO_FILE;
+      g_proxy_config.log_destination_ = logging::LOG_TO_FILE;
     } else if (log_dest_value.compare("system") == 0) {
-      g_proxy_config.log_destination_ = logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG;
+      g_proxy_config.log_destination_ = logging::LOG_TO_SYSTEM_DEBUG_LOG;
     } else if (log_dest_value.compare("both") == 0) {
-      g_proxy_config.log_destination_ =
-        logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG;
+      g_proxy_config.log_destination_ = logging::LOG_TO_ALL;
     } else {
       LOG(FATAL) << "Invalid logging destination value: " << log_dest_value;
     }
@@ -243,11 +242,9 @@ int main (int argc, char**argv)
   if (cl.HasSwitch("logfile")) {
     g_proxy_config.log_filename_ = cl.GetSwitchValueASCII("logfile");
     if (g_proxy_config.log_destination_ == logging::LOG_NONE) {
-      g_proxy_config.log_destination_ = logging::LOG_ONLY_TO_FILE;
+      g_proxy_config.log_destination_ = logging::LOG_TO_FILE;
     }
-  } else if (g_proxy_config.log_destination_ == logging::LOG_ONLY_TO_FILE ||
-             g_proxy_config.log_destination_ ==
-             logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG) {
+  } else if ((g_proxy_config.log_destination_ & logging::LOG_TO_FILE) != 0) {
     LOG(FATAL) << "Logging destination requires a log file to be specified.";
   }
 
@@ -272,11 +269,11 @@ int main (int argc, char**argv)
   if (cl.HasSwitch("force_spdy"))
     net::SMConnection::set_force_spdy(true);
 
-  InitLogging(g_proxy_config.log_filename_.c_str(),
-              g_proxy_config.log_destination_,
-              logging::DONT_LOCK_LOG_FILE,
-              logging::APPEND_TO_OLD_LOG_FILE,
-              logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+  logging::LoggingSettings settings;
+  settings.logging_dest = g_proxy_config.log_destination_;
+  settings.log_file = g_proxy_config.log_filename_.c_str();
+  settings.lock_log = logging::DONT_LOCK_LOG_FILE;
+  logging::InitLogging(settings);
 
   LOG(INFO) << "Flip SPDY proxy started with configuration:";
   LOG(INFO) << "Logging destination     : " << g_proxy_config.log_destination_;
diff --git a/net/tools/get_server_time/get_server_time.cc b/net/tools/get_server_time/get_server_time.cc
index 23b9304..c356212 100644
--- a/net/tools/get_server_time/get_server_time.cc
+++ b/net/tools/get_server_time/get_server_time.cc
@@ -230,12 +230,9 @@ int main(int argc, char* argv[]) {
 
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);
-  logging::InitLogging(
-      NULL,
-      logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
-      logging::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_SYSTEM_DEBUG_LOG;
+  logging::InitLogging(settings);
 
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   GURL url(parsed_command_line.GetSwitchValueASCII("url"));
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc
index 18fd41d..ec1209b 100644
--- a/net/tools/net_watcher/net_watcher.cc
+++ b/net/tools/net_watcher/net_watcher.cc
@@ -153,12 +153,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 #endif  // (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);
-  logging::InitLogging(
-      NULL,
-      logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
-      logging::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_SYSTEM_DEBUG_LOG;
+  logging::InitLogging(settings);
 
   // Just make the main message loop the network loop.
   base::MessageLoopForIO network_loop;
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index 9f5f561..59b75f1 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -28,12 +28,10 @@ int main(int argc, const char* argv[]) {
   CommandLine::Init(argc, argv);
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
-  if (!logging::InitLogging(
-          FILE_PATH_LITERAL("testserver.log"),
-          logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
-          logging::LOCK_LOG_FILE,
-          logging::APPEND_TO_OLD_LOG_FILE,
-          logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS)) {
+  logging::LoggingSettings settings;
+  settings.logging_dest = logging::LOG_TO_ALL;
+  settings.log_file = FILE_PATH_LITERAL("testserver.log");
+  if (!logging::InitLogging(settings)) {
     printf("Error: could not initialize logging. Exiting.\n");
     return -1;
   }
diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc
index 485bece..ec678ff 100644
--- a/net/tools/tld_cleanup/tld_cleanup.cc
+++ b/net/tools/tld_cleanup/tld_cleanup.cc
@@ -47,10 +47,10 @@ int main(int argc, const char* argv[]) {
 
   // Only use OutputDebugString in debug mode.
 #ifdef NDEBUG
-  logging::LoggingDestination destination = logging::LOG_ONLY_TO_FILE;
+  logging::LoggingDestination destination = logging::LOG_TO_FILE;
 #else
   logging::LoggingDestination destination =
-      logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG;
+      logging::LOG_TO_ALL;
 #endif
 
   CommandLine::Init(argc, argv);
@@ -58,12 +58,11 @@ int main(int argc, const char* argv[]) {
   base::FilePath log_filename;
   PathService::Get(base::DIR_EXE, &log_filename);
   log_filename = log_filename.AppendASCII("tld_cleanup.log");
-  logging::InitLogging(
-      log_filename.value().c_str(),
-      destination,
-      logging::LOCK_LOG_FILE,
-      logging::DELETE_OLD_LOG_FILE,
-      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+  logging::LoggingSettings settings;
+  settings.logging_dest = destination;
+  settings.log_file = log_filename.value().c_str();
+  settings.delete_old = logging::DELETE_OLD_LOG_FILE;
+  logging::InitLogging(settings);
 
   icu_util::Initialize();