Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4330)

Unified Diff: chrome/test/webdriver/webdriver_logging.cc

Issue 10411031: Fixing loglevel in chrome driver to accept string rather than an integer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added OFF driver logging level. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/webdriver/webdriver_logging.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..6323ff946108997b9c58e63ea648fda0458f8ea4 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,28 @@ 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") {
+ level = kOffLogLevel;
+ } else if (upper_case_name == "SEVERE") {
+ level = kSevereLogLevel;
+ } 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") {
@@ -99,6 +122,9 @@ void FileLog::Log(LogLevel level, const base::Time& time,
const char* level_name = "UNKNOWN";
switch (level) {
+ case kOffLogLevel:
+ level_name = "OFF";
+ break;
case kSevereLogLevel:
level_name = "SEVERE";
break;
« no previous file with comments | « chrome/test/webdriver/webdriver_logging.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698