Chromium Code Reviews| Index: chrome/test/webdriver/webdriver_logging.cc |
| diff --git a/chrome/test/webdriver/webdriver_logging.cc b/chrome/test/webdriver/webdriver_logging.cc |
| index feae90cc7ff23a39614eab4b08b2ef38ba2428ae..5ffa98f5902acdc989541fa0f7ca803f189829c8 100644 |
| --- a/chrome/test/webdriver/webdriver_logging.cc |
| +++ b/chrome/test/webdriver/webdriver_logging.cc |
| @@ -10,6 +10,7 @@ |
| #include "base/file_util.h" |
| #include "base/logging.h" |
| #include "base/string_number_conversions.h" |
| +#include "base/string_util.h" |
| #include "base/stringprintf.h" |
| #include "base/time.h" |
| #include "build/build_config.h" |
| @@ -24,6 +25,26 @@ FileLog* FileLog::singleton_ = NULL; |
| double start_time = 0; |
| +LogLevel LogLevelFromString(const std::string& name) { |
| + // Default logging level is INFO. |
| + LogLevel level = kInfoLogLevel; |
| + const std::string upper_case_name = StringToUpperASCII(name); |
| + if (upper_case_name == "OFF" || upper_case_name == "SEVERE") { |
| + level = kSevereLogLevel; |
|
kkania
2012/05/22 16:09:01
I think OFF should be a separate level. We shouldn
|
| + } else if (upper_case_name == "WARNING") { |
| + level = kWarningLogLevel; |
| + } else if (upper_case_name == "INFO" || upper_case_name == "CONFIG") { |
| + |
| + } else if (upper_case_name == "FINE") { |
| + level = kFineLogLevel; |
| + } else if (upper_case_name == "FINER") { |
| + level = kFinerLogLevel; |
| + } else if (upper_case_name == "ALL" || upper_case_name == "FINEST") { |
| + level = kAllLogLevel; |
| + } |
| + return level; |
| +} |
| + |
| // static |
| bool LogType::FromString(const std::string& name, LogType* log_type) { |
| if (name == "driver") { |