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

Unified Diff: chrome/test/chromedriver/logging.cc

Issue 14591005: C++ readability review from original change https://chromiumcodereview.appspot.com/14263024/ (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Rewrite ConsoleLogger::OnEvent from stringstream to printf. Created 7 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
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() {

Powered by Google App Engine
This is Rietveld 408576698