Index: chrome/test/chromedriver/logging.cc |
diff --git a/chrome/test/chromedriver/logging.cc b/chrome/test/chromedriver/logging.cc |
index 1e02ac3a099f9e0702fc74da69944695a1c39494..9078b97ccb2cb9183ed472761b2a2c59b3adcb77 100644 |
--- a/chrome/test/chromedriver/logging.cc |
+++ b/chrome/test/chromedriver/logging.cc |
@@ -17,7 +17,7 @@ namespace { |
// Map between WebDriverLog::WebDriverLevel and its name in WD wire protocol. |
// Array indices are the WebDriverLog::WebDriverLevel enum values. |
-const char* kWebDriverLevelNames[] = { |
+const char* const kWebDriverLevelNames[] = { |
"ALL", "DEBUG", "INFO", "WARNING", "SEVERE", "OFF" |
}; |
@@ -30,18 +30,20 @@ WebDriverLog::WebDriverLevel kLogLevelToWebDriverLevels[] = { |
WebDriverLog::kWdSevere // kError |
}; |
+// Translates Log::Level to WebDriverLog::WebDriverLevel. |
WebDriverLog::WebDriverLevel LogLevelToWebDriverLevel(Log::Level level) { |
const int index = level - Log::kDebug; |
- CHECK(index >= 0); |
- CHECK(static_cast<size_t>(index) < arraysize(kLogLevelToWebDriverLevels)); |
+ CHECK_GE(index, 0); |
+ CHECK_LT(static_cast<size_t>(index), arraysize(kLogLevelToWebDriverLevels)); |
return kLogLevelToWebDriverLevels[index]; |
} |
+// Returns WD wire protocol level name for a WebDriverLog::WebDriverLevel. |
std::string GetWebDriverLevelName( |
const WebDriverLog::WebDriverLevel level) { |
const int index = level - WebDriverLog::kWdAll; |
- CHECK(index >= 0); |
- CHECK(static_cast<size_t>(index) < arraysize(kWebDriverLevelNames)); |
+ CHECK_GE(index, 0); |
+ CHECK_LT(static_cast<size_t>(index), arraysize(kWebDriverLevelNames)); |
return kWebDriverLevelNames[index]; |
} |
@@ -70,7 +72,7 @@ WebDriverLog::WebDriverLog( |
WebDriverLog::~WebDriverLog() { |
VLOG(1) << "Log type '" << type_ << "' lost " |
- << entries_->GetSize() << " entries on destruction"; |
+ << entries_->GetSize() << " entries on destruction"; |
} |
const std::string& WebDriverLog::GetType() { |