codehealth: Replace deprecated base:Value methods

Also fix cpp lint warnings, and some very minor code cleanup.

Bug: 1187026, 1187025, 1187028, 1187034,1187038, 1187027
Change-Id: Ie4e99721dc24cd85547f92e6a13bc80d627b337d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3540913
Reviewed-by: Maksim Sadym <sadym@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#988997}

chrome/test/chromedriver/chrome/console_logger.cc

@@ -60,26 +60,25 @@ Status ConsoleLogger::OnEvent(
 }
 
 Status ConsoleLogger::OnLogEntryAdded(const base::DictionaryValue& params) {
-  const base::DictionaryValue* entry = nullptr;
-  if (!params.GetDictionary("entry", &entry))
+  const base::Value::Dict* entry = params.GetDict().FindDict("entry");
+  if (!entry)
     return Status(kUnknownError, "missing or invalid 'entry'");
 
-  std::string level_name;
+  const std::string* level_name = entry->FindString("level");
   Log::Level level;
-  if (!entry->GetString("level", &level_name) ||
-      !ConsoleLevelToLogLevel(level_name, &level))
+  if (!level_name || !ConsoleLevelToLogLevel(*level_name, &level))
     return Status(kUnknownError, "missing or invalid 'entry.level'");
 
-  std::string source;
-  if (!entry->GetString("source", &source))
+  const std::string* source = entry->FindString("source");
+  if (!source)
     return Status(kUnknownError, "missing or invalid 'entry.source'");
 
-  std::string origin;
-  if (!entry->GetString("url", &origin))
+  const std::string* origin = entry->FindString("url");
+  if (!origin)
     origin = source;
 
   std::string line_number;
-  int line = entry->FindIntKey("lineNumber").value_or(-1);
+  int line = entry->FindInt("lineNumber").value_or(-1);
   if (line >= 0) {
     line_number = base::StringPrintf("%d", line);
   } else {
@@ -88,14 +87,13 @@ Status ConsoleLogger::OnLogEntryAdded(const base::DictionaryValue& params) {
     line_number = "-";
   }
 
-  std::string text;
-  if (!entry->GetString("text", &text))
+  const std::string* text = entry->FindString("text");
+  if (!text)
     return Status(kUnknownError, "missing or invalid 'entry.text'");
 
-  log_->AddEntry(level, source, base::StringPrintf("%s %s %s",
-                                                   origin.c_str(),
-                                                   line_number.c_str(),
-                                                   text.c_str()));
+  log_->AddEntry(level, *source,
+                 base::StringPrintf("%s %s %s", origin->c_str(),
+                                    line_number.c_str(), text->c_str()));
   return Status(kOk);
 }
 

chrome/test/chromedriver/chrome/console_logger_unittest.cc

@@ -124,16 +124,18 @@ void ConsoleLogParams(base::DictionaryValue* out_params,
                       const char* level,
                       int lineNumber,
                       const char* text) {
+  base::Value::Dict* out_dict = out_params->GetIfDict();
+  CHECK(out_dict);
   if (source)
-    out_params->SetString("entry.source", source);
+    out_dict->SetByDottedPath("entry.source", source);
   if (url)
-    out_params->SetString("entry.url", url);
+    out_dict->SetByDottedPath("entry.url", url);
   if (level)
-    out_params->SetString("entry.level", level);
+    out_dict->SetByDottedPath("entry.level", level);
   if (lineNumber != -1)
-    out_params->SetInteger("entry.lineNumber", lineNumber);
+    out_dict->SetByDottedPath("entry.lineNumber", lineNumber);
   if (text)
-    out_params->SetString("entry.text", text);
+    out_dict->SetByDottedPath("entry.text", text);
 }
 
 }  // namespace
@@ -180,7 +182,7 @@ TEST(ConsoleLogger, ConsoleMessages) {
             client.TriggerEvent("Log.entryAdded", params7).code());
 
   base::DictionaryValue params8;  // No message object.
-  params8.SetInteger("gaga", 8);
+  params8.GetDict().Set("gaga", 8);
   ASSERT_EQ(kUnknownError,
             client.TriggerEvent("Log.entryAdded", params8).code());