Allow --v and --log-level switches simultaneous usage.

chrome/common/logging_chrome.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the
 // ViewMsgLog et al. functions.
@@ skipping 318 matching lines @@
   // Variable or by the Command Line Switch.  This is for
   // automated test purposes.
   scoped_ptr<base::Environment> env(base::Environment::Create());
   if (env->HasVar(env_vars::kHeadless) ||
       command_line.HasSwitch(switches::kNoErrorDialogs))
     SuppressDialogs();
 
   // Use a minimum log level if the command line asks for one,
   // otherwise leave it at the default level (INFO).
   if (command_line.HasSwitch(switches::kLoggingLevel)) {
-    std::string log_level = command_line.GetSwitchValueASCII(
-        switches::kLoggingLevel);
-    int level = 0;
-    if (base::StringToInt(log_level, &level) &&
-        level >= 0 && level < LOG_NUM_SEVERITIES) {
-      logging::SetMinLogLevel(level);
-    } else {
-      DLOG(WARNING) << "Bad log level: " << log_level;
+    // Use this switch unless the vlogging level was specified in the command
+    // line by another switch.
+    if (logging::GetMinLogLevel() >= 0) {

[Lei Zhang, 2015/05/14 02:31:31]

Do this in the same if statement as the command_line.HasSwitch() check above?

[emaxx, 2015/05/15 12:59:42]

Done.

+      std::string log_level =
+          command_line.GetSwitchValueASCII(switches::kLoggingLevel);
+      int level = 0;
+      if (base::StringToInt(log_level, &level) && level >= 0 &&
+          level < LOG_NUM_SEVERITIES) {
+        logging::SetMinLogLevel(level);
+      } else {
+        DLOG(WARNING) << "Bad log level: " << log_level;
+      }
     }
   }
 
 #if defined(OS_WIN)
   // Enable trace control and transport through event tracing for Windows.
   logging::LogEventProvider::Initialize(kChromeTraceProviderName);
 #endif
 
   chrome_logging_initialized_ = true;
 }
@@ skipping 42 matching lines @@
                                           time_deets.year,
                                           time_deets.month,
                                           time_deets.day_of_month,
                                           time_deets.hour,
                                           time_deets.minute,
                                           time_deets.second);
   return base_path.InsertBeforeExtensionASCII(suffix);
 }
 
 }  // namespace logging